Skip to content

Commit

Permalink
Merge branch 'release' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
Eilon committed Apr 13, 2016
2 parents 946d895 + 4f24339 commit 0cf9a4b
Show file tree
Hide file tree
Showing 15 changed files with 96 additions and 29 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
ASP.NET MVC
ASP.NET Core MVC
===

AppVeyor: [![AppVeyor](https://ci.appveyor.com/api/projects/status/969jbosi0qwc1awg/branch/dev?svg=true)](https://ci.appveyor.com/project/aspnetci/mvc/branch/dev)

Travis: [![Travis](https://travis-ci.org/aspnet/Mvc.svg?branch=dev)](https://travis-ci.org/aspnet/Mvc)

ASP.NET MVC gives you a powerful, patterns-based way to build dynamic websites that enables a clean separation of concerns and gives you full control over markup for enjoyable, agile development. ASP.NET MVC includes many features that enable fast, TDD-friendly development for creating sophisticated applications that use the latest web standards.
ASP.NET Core MVC gives you a powerful, patterns-based way to build dynamic websites that enables a clean separation of concerns and gives you full control over markup for enjoyable, agile development. ASP.NET Core MVC includes many features that enable fast, TDD-friendly development for creating sophisticated applications that use the latest web standards.

ASP.NET MVC in ASP.NET Core includes support for building web pages and HTTP services in a single aligned framework that can be hosted in IIS or self-hosted in your own process.
ASP.NET Core MVC in ASP.NET Core includes support for building web pages and HTTP services in a single aligned framework that can be hosted in IIS or self-hosted in your own process.

Related community projects:
* [AspNet.Mvc.TypedRouting](https://github.com/ivaylokenov/AspNet.Mvc.TypedRouting): A collection of extension methods providing strongly typed routing and link generation for ASP.NET MVC projects.
* [ASP.NET MVC Boilerplate](https://visualstudiogallery.msdn.microsoft.com/6cf50a48-fc1e-4eaf-9e82-0b2a6705ca7d): Rich templates for ASP.NET MVC.
* [AspNet.Mvc.TypedRouting](https://github.com/ivaylokenov/AspNet.Mvc.TypedRouting): A collection of extension methods providing strongly typed routing and link generation for ASP.NET Core MVC projects.
* [ASP.NET MVC Boilerplate](https://visualstudiogallery.msdn.microsoft.com/6cf50a48-fc1e-4eaf-9e82-0b2a6705ca7d): Rich templates for ASP.NET Core MVC.

This project is part of ASP.NET Core. You can find samples, documentation and getting started instructions for ASP.NET Core at the [Home](https://github.com/aspnet/home) repo.
8 changes: 6 additions & 2 deletions src/Microsoft.AspNetCore.Mvc.Abstractions/project.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
{
"description": "The core abstractions of ASP.NET MVC.",
"description": "ASP.NET Core MVC abstractions and interfaces for action invocation and dispatching, authorization, action filters, formatters, model binding, routing, validation, and more.\r\nCommonly used types:\r\nMicrosoft.AspNetCore.Mvc.IActionResult",
"tags": [
"aspnetcore",
"aspnetcoremvc"
],
"version": "1.0.0-*",
"repository": {
"type": "git",
Expand Down Expand Up @@ -34,7 +38,7 @@
"Microsoft.Net.Http.Headers": "1.0.0-*"
},
"frameworks": {
"net451": {},
"net451": { },
"netstandard1.3": {
"dependencies": {
"Microsoft.CSharp": "4.0.1-*",
Expand Down
8 changes: 6 additions & 2 deletions src/Microsoft.AspNetCore.Mvc.ApiExplorer/project.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
{
"description": "Contains API explorer functionality for ASP.NET MVC for discovering metadata such as the list of controllers and actions, and their URLs and allowed HTTP methods.",
"description": "ASP.NET Core MVC API explorer functionality for discovering metadata such as the list of controllers and actions, and their URLs and allowed HTTP methods.",
"tags": [
"aspnetcore",
"aspnetcoremvc"
],
"version": "1.0.0-*",
"repository": {
"type": "git",
Expand All @@ -25,7 +29,7 @@
}
},
"frameworks": {
"net451": {},
"net451": { },
"netstandard1.5": {
"imports": [
"portable-net451+win8"
Expand Down
8 changes: 6 additions & 2 deletions src/Microsoft.AspNetCore.Mvc.Core/project.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
{
"description": "The core runtime components of ASP.NET MVC.",
"description": "ASP.NET Core MVC core components. Contains common action result types, attribute routing, application model conventions, API explorer, application parts, filters, formatters, model binding, and more.\r\nCommonly used types:\r\nMicrosoft.AspNetCore.Mvc.AreaAttribute\r\nMicrosoft.AspNetCore.Mvc.BindAttribute\r\nMicrosoft.AspNetCore.Mvc.ControllerBase\r\nMicrosoft.AspNetCore.Mvc.FromBodyAttribute\r\nMicrosoft.AspNetCore.Mvc.FromFormAttribute\r\nMicrosoft.AspNetCore.Mvc.RequireHttpsAttribute\r\nMicrosoft.AspNetCore.Mvc.RouteAttribute",
"tags": [
"aspnetcore",
"aspnetcoremvc"
],
"version": "1.0.0-*",
"repository": {
"type": "git",
Expand Down Expand Up @@ -50,7 +54,7 @@
"System.Diagnostics.DiagnosticSource": "4.0.0-*"
},
"frameworks": {
"net451": {},
"net451": { },
"netstandard1.5": {
"imports": [
"portable-net451+win8"
Expand Down
9 changes: 7 additions & 2 deletions src/Microsoft.AspNetCore.Mvc.Cors/project.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"description": "CORS features for the core MVC runtime",
"description": "ASP.NET Core MVC cross-origin resource sharing (CORS) features.",
"tags": [
"aspnetcore",
"aspnetcoremvc",
"cors"
],
"version": "1.0.0-*",
"repository": {
"type": "git",
Expand All @@ -18,7 +23,7 @@
"Microsoft.AspNetCore.Mvc.Core": "1.0.0-*"
},
"frameworks": {
"net451": {},
"net451": { },
"netstandard1.5": {
"imports": [
"portable-net451+win8"
Expand Down
6 changes: 5 additions & 1 deletion src/Microsoft.AspNetCore.Mvc.DataAnnotations/project.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
{
"description": "Metadata and Validation using System.ComponentModel.DataAnnotations for the MVC runtime",
"description": "ASP.NET Core MVC metadata and validation system using System.ComponentModel.DataAnnotations.",
"tags": [
"aspnetcore",
"aspnetcoremvc"
],
"version": "1.0.0-*",
"repository": {
"type": "git",
Expand Down
9 changes: 7 additions & 2 deletions src/Microsoft.AspNetCore.Mvc.Formatters.Json/project.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"description": "JSON input and output for the MVC runtime",
"description": "ASP.NET Core MVC formatters for JSON input and output and for JSON PATCH input using Json.NET.",
"tags": [
"aspnetcore",
"aspnetcoremvc",
"json"
],
"version": "1.0.0-*",
"repository": {
"type": "git",
Expand All @@ -22,7 +27,7 @@
}
},
"frameworks": {
"net451": {},
"net451": { },
"netstandard1.5": {
"imports": [
"portable-net451+win8"
Expand Down
7 changes: 6 additions & 1 deletion src/Microsoft.AspNetCore.Mvc.Formatters.Xml/project.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"description": "Contains DataContractSerializer and XmlSerializer based input and output formatters",
"description": "ASP.NET Core MVC formatters for XML input and output using DataContractSerializer and XmlSerializer.",
"tags": [
"aspnetcore",
"aspnetcoremvc",
"xml"
],
"version": "1.0.0-*",
"repository": {
"type": "git",
Expand Down
9 changes: 7 additions & 2 deletions src/Microsoft.AspNetCore.Mvc.Localization/project.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"description": "Features that enable globalization & localization of MVC applications.",
"description": "ASP.NET Core MVC features that enable globalization and localization of applications.\r\nCommonly used types:\r\nMicrosoft.AspNetCore.Mvc.Localization.IHtmlLocalizer<TResource>\r\nMicrosoft.AspNetCore.Mvc.Localization.IViewLocalizer",
"tags": [
"aspnetcore",
"aspnetcoremvc",
"localization"
],
"version": "1.0.0-*",
"compilationOptions": {
"warningsAsErrors": true,
Expand All @@ -20,7 +25,7 @@
}
},
"frameworks": {
"net451": {},
"net451": { },
"netstandard1.5": {
"imports": [
"portable-net45+win8"
Expand Down
10 changes: 8 additions & 2 deletions src/Microsoft.AspNetCore.Mvc.Razor.Host/project.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
{
"description": "Design time hosting infrastructure for the ASP.NET MVC Razor view engine.",
"description": "ASP.NET Core MVC design time hosting infrastructure for the Razor view engine.",
"tags": [
"aspnetcore",
"aspnetcoremvc",
"cshtml",
"razor"
],
"version": "1.0.0-*",
"repository": {
"type": "git",
Expand All @@ -23,7 +29,7 @@
}
},
"frameworks": {
"net451": {},
"net451": { },
"netstandard1.5": {
"dependencies": {
"System.Collections.Concurrent": "4.0.12-*",
Expand Down
8 changes: 7 additions & 1 deletion src/Microsoft.AspNetCore.Mvc.Razor/project.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
{
"description": "The Razor view engine for ASP.NET MVC.",
"description": "ASP.NET Core MVC Razor view engine for CSHTML files.",
"tags": [
"aspnetcore",
"aspnetcoremvc",
"cshtml",
"razor"
],
"version": "1.0.0-*",
"repository": {
"type": "git",
Expand Down
10 changes: 8 additions & 2 deletions src/Microsoft.AspNetCore.Mvc.TagHelpers/project.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
{
"description": "Contains a default set of Tag Helpers for building ASP.NET MVC applications.",
"description": "ASP.NET Core MVC default tag helpers. Contains tag helpers for anchor tags, HTML input elements, caching, scripts, links (for CSS), and more.",
"tags": [
"aspnetcore",
"aspnetcoremvc",
"taghelper",
"taghelpers"
],
"version": "1.0.0-*",
"repository": {
"type": "git",
Expand Down Expand Up @@ -32,7 +38,7 @@
}
},
"frameworks": {
"net451": {},
"net451": { },
"netstandard1.5": {
"imports": [
"portable-net45+win8"
Expand Down
8 changes: 6 additions & 2 deletions src/Microsoft.AspNetCore.Mvc.ViewFeatures/project.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
{
"description": "View Rendering features for the MVC runtime",
"description": "ASP.NET Core MVC view rendering features. Contains common types used in most MVC applications as well as view rendering features such as view engines, views, view components, and HTML helpers.\r\nCommonly used types:\r\nMicrosoft.AspNetCore.Mvc.Controller\r\nMicrosoft.AspNetCore.Mvc.ValidateAntiForgeryTokenAttribute\r\nMicrosoft.AspNetCore.Mvc.ViewComponent",
"tags": [
"aspnetcore",
"aspnetcoremvc"
],
"version": "1.0.0-*",
"repository": {
"type": "git",
Expand Down Expand Up @@ -45,7 +49,7 @@
"System.Buffers": "4.0.0-*"
},
"frameworks": {
"net451": {},
"net451": { },
"netstandard1.5": {
"imports": [
"portable-net451+win8"
Expand Down
7 changes: 6 additions & 1 deletion src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/project.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"description": "Provides compatibility in ASP.NET MVC with ASP.NET Web API 2 to simplify migration of existing Web API implementations.",
"description": "Provides compatibility in ASP.NET Core MVC with ASP.NET Web API 2 to simplify migration of existing Web API implementations.\r\nCommonly used types:\r\nSystem.Web.Http.ApiController",
"tags": [
"aspnetcore",
"aspnetcoremvc",
"aspnetwebapi"
],
"version": "1.0.0-*",
"repository": {
"type": "git",
Expand Down
8 changes: 6 additions & 2 deletions src/Microsoft.AspNetCore.Mvc/project.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
{
"description": "ASP.NET MVC is a web framework that gives you a powerful, patterns-based way to build dynamic websites and Web APIs. ASP.NET MVC enables a clean separation of concerns and gives you full control over markup.",
"description": "ASP.NET Core MVC is a web framework that gives you a powerful, patterns-based way to build dynamic websites and web APIs. ASP.NET Core MVC enables a clean separation of concerns and gives you full control over markup.",
"tags": [
"aspnetcore",
"aspnetcoremvc"
],
"version": "1.0.0-*",
"repository": {
"type": "git",
Expand Down Expand Up @@ -30,7 +34,7 @@
}
},
"frameworks": {
"net451": {},
"net451": { },
"netstandard1.5": {
"imports": [
"portable-net451+win8"
Expand Down

0 comments on commit 0cf9a4b

Please sign in to comment.