From 5092e75387f294ce89c7a0ce06d575edfd0848d2 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Tue, 26 Jul 2016 12:09:57 -0700 Subject: [PATCH 1/2] Pin repo version to 1.0.1 --- samples/MvcSandbox/project.json | 2 +- .../project.json | 2 +- .../project.json | 4 ++-- src/Microsoft.AspNetCore.Mvc.Core/project.json | 4 ++-- src/Microsoft.AspNetCore.Mvc.Cors/project.json | 4 ++-- .../project.json | 4 ++-- .../project.json | 4 ++-- .../project.json | 4 ++-- .../project.json | 4 ++-- .../project.json | 2 +- .../project.json | 6 +++--- .../project.json | 4 ++-- .../project.json | 8 ++++---- .../project.json | 6 +++--- src/Microsoft.AspNetCore.Mvc/project.json | 18 +++++++++--------- .../project.json | 2 +- .../project.json | 4 ++-- .../project.json | 4 ++-- .../project.json | 4 ++-- .../project.json | 4 ++-- .../project.json | 4 ++-- .../project.json | 4 ++-- .../project.json | 6 +++--- .../project.json | 4 ++-- .../project.json | 6 +++--- .../project.json | 12 ++++++------ .../project.json | 8 ++++---- .../project.json | 6 +++--- .../Microsoft.AspNetCore.Mvc.Test/project.json | 4 ++-- .../project.json | 4 ++-- .../project.json | 2 +- test/WebSites/ApiExplorerWebSite/project.json | 6 +++--- .../ApplicationModelWebSite/project.json | 4 ++-- test/WebSites/BasicWebSite/project.json | 6 +++--- .../project.json | 2 +- .../project.json | 4 ++-- test/WebSites/CorsWebSite/project.json | 6 +++--- .../ErrorPageMiddlewareWebSite/project.json | 4 ++-- test/WebSites/FilesWebSite/project.json | 4 ++-- test/WebSites/FiltersWebSite/project.json | 6 +++--- test/WebSites/FormatterWebSite/project.json | 6 +++--- .../HtmlGenerationWebSite/project.json | 6 +++--- .../project.json | 2 +- .../project.json | 4 ++-- test/WebSites/RazorWebSite/project.json | 6 +++--- test/WebSites/RoutingWebSite/project.json | 4 ++-- test/WebSites/SimpleWebSite/project.json | 2 +- test/WebSites/TagHelpersWebSite/project.json | 4 ++-- test/WebSites/VersioningWebSite/project.json | 4 ++-- .../WebApiCompatShimWebSite/project.json | 6 +++--- .../WebSites/XmlFormattersWebSite/project.json | 6 +++--- 51 files changed, 123 insertions(+), 123 deletions(-) diff --git a/samples/MvcSandbox/project.json b/samples/MvcSandbox/project.json index 5bd8b77b89..b3bae274f1 100644 --- a/samples/MvcSandbox/project.json +++ b/samples/MvcSandbox/project.json @@ -6,7 +6,7 @@ }, "dependencies": { "Microsoft.AspNetCore.Diagnostics": "1.0.0", - "Microsoft.AspNetCore.Mvc": "1.0.1-*", + "Microsoft.AspNetCore.Mvc": "1.0.1", "Microsoft.AspNetCore.Razor.Tools": { "type": "build", "version": "1.0.0-preview2-final" diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/project.json b/src/Microsoft.AspNetCore.Mvc.Abstractions/project.json index 20f7c4204b..0ed02e52bc 100644 --- a/src/Microsoft.AspNetCore.Mvc.Abstractions/project.json +++ b/src/Microsoft.AspNetCore.Mvc.Abstractions/project.json @@ -1,6 +1,6 @@ { "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", - "version": "1.0.1-*", + "version": "1.0.1", "packOptions": { "repository": { "type": "git", diff --git a/src/Microsoft.AspNetCore.Mvc.ApiExplorer/project.json b/src/Microsoft.AspNetCore.Mvc.ApiExplorer/project.json index eef3ea9a51..7eed7eeb99 100644 --- a/src/Microsoft.AspNetCore.Mvc.ApiExplorer/project.json +++ b/src/Microsoft.AspNetCore.Mvc.ApiExplorer/project.json @@ -1,6 +1,6 @@ { "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.", - "version": "1.0.1-*", + "version": "1.0.1", "packOptions": { "repository": { "type": "git", @@ -20,7 +20,7 @@ "xmlDoc": true }, "dependencies": { - "Microsoft.AspNetCore.Mvc.Core": "1.0.1-*", + "Microsoft.AspNetCore.Mvc.Core": "1.0.1", "Microsoft.Extensions.PropertyHelper.Sources": { "version": "1.0.0-rtm-21431", "type": "build" diff --git a/src/Microsoft.AspNetCore.Mvc.Core/project.json b/src/Microsoft.AspNetCore.Mvc.Core/project.json index aa2463d93d..6777f0952e 100644 --- a/src/Microsoft.AspNetCore.Mvc.Core/project.json +++ b/src/Microsoft.AspNetCore.Mvc.Core/project.json @@ -1,6 +1,6 @@ { "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", - "version": "1.0.1-*", + "version": "1.0.1", "packOptions": { "repository": { "type": "git", @@ -22,7 +22,7 @@ "dependencies": { "Microsoft.AspNetCore.Authorization": "1.0.0", "Microsoft.AspNetCore.Hosting.Abstractions": "1.0.0", - "Microsoft.AspNetCore.Mvc.Abstractions": "1.0.1-*", + "Microsoft.AspNetCore.Mvc.Abstractions": "1.0.1", "Microsoft.AspNetCore.Http": "1.0.0", "Microsoft.AspNetCore.Routing": "1.0.0", "Microsoft.AspNetCore.Routing.DecisionTree.Sources": { diff --git a/src/Microsoft.AspNetCore.Mvc.Cors/project.json b/src/Microsoft.AspNetCore.Mvc.Cors/project.json index 8b684cd919..895e457de8 100644 --- a/src/Microsoft.AspNetCore.Mvc.Cors/project.json +++ b/src/Microsoft.AspNetCore.Mvc.Cors/project.json @@ -1,6 +1,6 @@ { "description": "ASP.NET Core MVC cross-origin resource sharing (CORS) features.", - "version": "1.0.1-*", + "version": "1.0.1", "packOptions": { "repository": { "type": "git", @@ -22,7 +22,7 @@ }, "dependencies": { "Microsoft.AspNetCore.Cors": "1.0.0", - "Microsoft.AspNetCore.Mvc.Core": "1.0.1-*" + "Microsoft.AspNetCore.Mvc.Core": "1.0.1" }, "frameworks": { "net451": {}, diff --git a/src/Microsoft.AspNetCore.Mvc.DataAnnotations/project.json b/src/Microsoft.AspNetCore.Mvc.DataAnnotations/project.json index ec71ea26a5..f9227110dd 100644 --- a/src/Microsoft.AspNetCore.Mvc.DataAnnotations/project.json +++ b/src/Microsoft.AspNetCore.Mvc.DataAnnotations/project.json @@ -1,6 +1,6 @@ { "description": "ASP.NET Core MVC metadata and validation system using System.ComponentModel.DataAnnotations.", - "version": "1.0.1-*", + "version": "1.0.1", "packOptions": { "repository": { "type": "git", @@ -20,7 +20,7 @@ "xmlDoc": true }, "dependencies": { - "Microsoft.AspNetCore.Mvc.Core": "1.0.1-*", + "Microsoft.AspNetCore.Mvc.Core": "1.0.1", "Microsoft.Extensions.ClosedGenericMatcher.Sources": { "version": "1.0.0-rtm-21431", "type": "build" diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Json/project.json b/src/Microsoft.AspNetCore.Mvc.Formatters.Json/project.json index 868acf2697..f671569e3f 100644 --- a/src/Microsoft.AspNetCore.Mvc.Formatters.Json/project.json +++ b/src/Microsoft.AspNetCore.Mvc.Formatters.Json/project.json @@ -1,6 +1,6 @@ { "description": "ASP.NET Core MVC formatters for JSON input and output and for JSON PATCH input using Json.NET.", - "version": "1.0.1-*", + "version": "1.0.1", "packOptions": { "repository": { "type": "git", @@ -22,7 +22,7 @@ }, "dependencies": { "Microsoft.AspNetCore.JsonPatch": "1.0.0", - "Microsoft.AspNetCore.Mvc.Core": "1.0.1-*", + "Microsoft.AspNetCore.Mvc.Core": "1.0.1", "Microsoft.Extensions.ClosedGenericMatcher.Sources": { "version": "1.0.0-rtm-21431", "type": "build" diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/project.json b/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/project.json index 9973a8ce5c..cfd6203331 100644 --- a/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/project.json +++ b/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/project.json @@ -1,6 +1,6 @@ { "description": "ASP.NET Core MVC formatters for XML input and output using DataContractSerializer and XmlSerializer.", - "version": "1.0.1-*", + "version": "1.0.1", "packOptions": { "repository": { "type": "git", @@ -21,7 +21,7 @@ "xmlDoc": true }, "dependencies": { - "Microsoft.AspNetCore.Mvc.Core": "1.0.1-*", + "Microsoft.AspNetCore.Mvc.Core": "1.0.1", "Microsoft.Extensions.ClosedGenericMatcher.Sources": { "version": "1.0.0-rtm-21431", "type": "build" diff --git a/src/Microsoft.AspNetCore.Mvc.Localization/project.json b/src/Microsoft.AspNetCore.Mvc.Localization/project.json index 8c7718c7e7..c8b56d188b 100644 --- a/src/Microsoft.AspNetCore.Mvc.Localization/project.json +++ b/src/Microsoft.AspNetCore.Mvc.Localization/project.json @@ -1,6 +1,6 @@ { "description": "ASP.NET Core MVC features that enable globalization and localization of applications.\r\nCommonly used types:\r\nMicrosoft.AspNetCore.Mvc.Localization.IHtmlLocalizer\r\nMicrosoft.AspNetCore.Mvc.Localization.IViewLocalizer", - "version": "1.0.1-*", + "version": "1.0.1", "buildOptions": { "warningsAsErrors": true, "keyFile": "../../tools/Key.snk", @@ -11,7 +11,7 @@ }, "dependencies": { "Microsoft.AspNetCore.Localization": "1.0.0", - "Microsoft.AspNetCore.Mvc.Razor": "1.0.1-*", + "Microsoft.AspNetCore.Mvc.Razor": "1.0.1", "Microsoft.Extensions.DependencyInjection": "1.0.0", "Microsoft.Extensions.Localization": "1.0.0", "Microsoft.Extensions.PropertyHelper.Sources": { diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.Host/project.json b/src/Microsoft.AspNetCore.Mvc.Razor.Host/project.json index be736b73f0..c659893927 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor.Host/project.json +++ b/src/Microsoft.AspNetCore.Mvc.Razor.Host/project.json @@ -1,6 +1,6 @@ { "description": "ASP.NET Core MVC design time hosting infrastructure for the Razor view engine.", - "version": "1.0.1-*", + "version": "1.0.1", "packOptions": { "repository": { "type": "git", diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/project.json b/src/Microsoft.AspNetCore.Mvc.Razor/project.json index f03512e3b8..d955af3b00 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor/project.json +++ b/src/Microsoft.AspNetCore.Mvc.Razor/project.json @@ -1,6 +1,6 @@ { "description": "ASP.NET Core MVC Razor view engine for CSHTML files.", - "version": "1.0.1-*", + "version": "1.0.1", "packOptions": { "repository": { "type": "git", @@ -22,8 +22,8 @@ "xmlDoc": true }, "dependencies": { - "Microsoft.AspNetCore.Mvc.Razor.Host": "1.0.1-*", - "Microsoft.AspNetCore.Mvc.ViewFeatures": "1.0.1-*", + "Microsoft.AspNetCore.Mvc.Razor.Host": "1.0.1", + "Microsoft.AspNetCore.Mvc.ViewFeatures": "1.0.1", "Microsoft.CodeAnalysis.CSharp": "1.3.0", "Microsoft.Extensions.FileProviders.Composite": "1.0.0", "Microsoft.Extensions.HashCodeCombiner.Sources": { diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/project.json b/src/Microsoft.AspNetCore.Mvc.TagHelpers/project.json index feb9274820..e3d6b193e0 100644 --- a/src/Microsoft.AspNetCore.Mvc.TagHelpers/project.json +++ b/src/Microsoft.AspNetCore.Mvc.TagHelpers/project.json @@ -1,6 +1,6 @@ { "description": "ASP.NET Core MVC default tag helpers. Contains tag helpers for anchor tags, HTML input elements, caching, scripts, links (for CSS), and more.", - "version": "1.0.1-*", + "version": "1.0.1", "packOptions": { "repository": { "type": "git", @@ -22,7 +22,7 @@ "xmlDoc": true }, "dependencies": { - "Microsoft.AspNetCore.Mvc.Razor": "1.0.1-*", + "Microsoft.AspNetCore.Mvc.Razor": "1.0.1", "Microsoft.Extensions.Caching.Memory": "1.0.0", "Microsoft.Extensions.FileSystemGlobbing": "1.0.0", "Microsoft.Extensions.Logging.Abstractions": { diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/project.json b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/project.json index 8b8e7ffd4d..f537df3639 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/project.json +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/project.json @@ -1,6 +1,6 @@ { "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", - "version": "1.0.1-*", + "version": "1.0.1", "packOptions": { "repository": { "type": "git", @@ -23,9 +23,9 @@ "Microsoft.AspNetCore.Antiforgery": "1.0.0", "Microsoft.AspNetCore.Diagnostics.Abstractions": "1.0.0", "Microsoft.AspNetCore.Html.Abstractions": "1.0.0", - "Microsoft.AspNetCore.Mvc.Core": "1.0.1-*", - "Microsoft.AspNetCore.Mvc.DataAnnotations": "1.0.1-*", - "Microsoft.AspNetCore.Mvc.Formatters.Json": "1.0.1-*", + "Microsoft.AspNetCore.Mvc.Core": "1.0.1", + "Microsoft.AspNetCore.Mvc.DataAnnotations": "1.0.1", + "Microsoft.AspNetCore.Mvc.Formatters.Json": "1.0.1", "Microsoft.Extensions.ClosedGenericMatcher.Sources": { "version": "1.0.0-rtm-21431", "type": "build" diff --git a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/project.json b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/project.json index 761ccc7aad..6b25e91c08 100644 --- a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/project.json +++ b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/project.json @@ -1,6 +1,6 @@ { "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", - "version": "1.0.1-*", + "version": "1.0.1", "packOptions": { "repository": { "type": "git", @@ -21,8 +21,8 @@ "xmlDoc": true }, "dependencies": { - "Microsoft.AspNetCore.Mvc.Core": "1.0.1-*", - "Microsoft.AspNetCore.Mvc.Formatters.Json": "1.0.1-*", + "Microsoft.AspNetCore.Mvc.Core": "1.0.1", + "Microsoft.AspNetCore.Mvc.Formatters.Json": "1.0.1", "Microsoft.AspNet.WebApi.Client": "5.2.2", "Microsoft.AspNetCore.WebUtilities": "1.0.0", "Microsoft.Extensions.PropertyHelper.Sources": { diff --git a/src/Microsoft.AspNetCore.Mvc/project.json b/src/Microsoft.AspNetCore.Mvc/project.json index 3a6c3c0930..51db9376b2 100644 --- a/src/Microsoft.AspNetCore.Mvc/project.json +++ b/src/Microsoft.AspNetCore.Mvc/project.json @@ -1,6 +1,6 @@ { "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.", - "version": "1.0.1-*", + "version": "1.0.1", "packOptions": { "repository": { "type": "git", @@ -20,14 +20,14 @@ "xmlDoc": true }, "dependencies": { - "Microsoft.AspNetCore.Mvc.ApiExplorer": "1.0.1-*", - "Microsoft.AspNetCore.Mvc.Cors": "1.0.1-*", - "Microsoft.AspNetCore.Mvc.DataAnnotations": "1.0.1-*", - "Microsoft.AspNetCore.Mvc.Formatters.Json": "1.0.1-*", - "Microsoft.AspNetCore.Mvc.Localization": "1.0.1-*", - "Microsoft.AspNetCore.Mvc.Razor": "1.0.1-*", - "Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.1-*", - "Microsoft.AspNetCore.Mvc.ViewFeatures": "1.0.1-*", + "Microsoft.AspNetCore.Mvc.ApiExplorer": "1.0.1", + "Microsoft.AspNetCore.Mvc.Cors": "1.0.1", + "Microsoft.AspNetCore.Mvc.DataAnnotations": "1.0.1", + "Microsoft.AspNetCore.Mvc.Formatters.Json": "1.0.1", + "Microsoft.AspNetCore.Mvc.Localization": "1.0.1", + "Microsoft.AspNetCore.Mvc.Razor": "1.0.1", + "Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.1", + "Microsoft.AspNetCore.Mvc.ViewFeatures": "1.0.1", "Microsoft.Extensions.Caching.Memory": "1.0.0", "Microsoft.Extensions.DependencyInjection": "1.0.0", "Microsoft.Extensions.PropertyHelper.Sources": { diff --git a/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/project.json index 1b6849482a..0057ebd398 100644 --- a/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/project.json @@ -5,7 +5,7 @@ }, "dependencies": { "dotnet-test-xunit": "1.0.0-rc3-000000-01", - "Microsoft.AspNetCore.Mvc": "1.0.1-*", + "Microsoft.AspNetCore.Mvc": "1.0.1", "Microsoft.AspNetCore.Testing": "1.0.0-rtm-21431" }, "testRunner": "xunit", diff --git a/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/project.json b/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/project.json index 9c8172c7ba..7db57231cb 100644 --- a/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.ApiExplorer.Test/project.json @@ -4,8 +4,8 @@ }, "dependencies": { "dotnet-test-xunit": "1.0.0-rc3-000000-01", - "Microsoft.AspNetCore.Mvc": "1.0.1-*", - "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.1-*", + "Microsoft.AspNetCore.Mvc": "1.0.1", + "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.1", "Microsoft.AspNetCore.Mvc.TestCommon": { "version": "1.0.0-*", "type": "build" diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Core.Test/project.json index 0b33d0de9e..438d3daf44 100644 --- a/test/Microsoft.AspNetCore.Mvc.Core.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.Core.Test/project.json @@ -7,8 +7,8 @@ "dependencies": { "dotnet-test-xunit": "1.0.0-rc3-000000-01", "Microsoft.AspNetCore.Http": "1.0.0", - "Microsoft.AspNetCore.Mvc": "1.0.1-*", - "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.1-*", + "Microsoft.AspNetCore.Mvc": "1.0.1", + "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.1", "Microsoft.AspNetCore.Mvc.TestCommon": { "version": "1.0.0-*", "type": "build" diff --git a/test/Microsoft.AspNetCore.Mvc.Cors.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Cors.Test/project.json index 601e66b11d..ff9dd6365a 100644 --- a/test/Microsoft.AspNetCore.Mvc.Cors.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.Cors.Test/project.json @@ -5,8 +5,8 @@ "dependencies": { "dotnet-test-xunit": "1.0.0-rc3-000000-01", "Microsoft.AspNetCore.Http": "1.0.0", - "Microsoft.AspNetCore.Mvc": "1.0.1-*", - "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.1-*", + "Microsoft.AspNetCore.Mvc": "1.0.1", + "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.1", "Microsoft.AspNetCore.Mvc.TestCommon": { "version": "1.0.0-*", "type": "build" diff --git a/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/project.json b/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/project.json index 90ce757ccf..fb1c6fb764 100644 --- a/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/project.json @@ -5,8 +5,8 @@ }, "dependencies": { "dotnet-test-xunit": "1.0.0-rc3-000000-01", - "Microsoft.AspNetCore.Mvc": "1.0.1-*", - "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.1-*", + "Microsoft.AspNetCore.Mvc": "1.0.1", + "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.1", "Microsoft.AspNetCore.Mvc.TestCommon": { "version": "1.0.0-*", "type": "build" diff --git a/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/project.json index 601e66b11d..ff9dd6365a 100644 --- a/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/project.json @@ -5,8 +5,8 @@ "dependencies": { "dotnet-test-xunit": "1.0.0-rc3-000000-01", "Microsoft.AspNetCore.Http": "1.0.0", - "Microsoft.AspNetCore.Mvc": "1.0.1-*", - "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.1-*", + "Microsoft.AspNetCore.Mvc": "1.0.1", + "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.1", "Microsoft.AspNetCore.Mvc.TestCommon": { "version": "1.0.0-*", "type": "build" diff --git a/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/project.json index b86ddddf6f..8ce7af101b 100644 --- a/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/project.json @@ -6,8 +6,8 @@ "dependencies": { "dotnet-test-xunit": "1.0.0-rc3-000000-01", "Microsoft.AspNetCore.Http": "1.0.0", - "Microsoft.AspNetCore.Mvc": "1.0.1-*", - "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.1-*", + "Microsoft.AspNetCore.Mvc": "1.0.1", + "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.1", "Microsoft.AspNetCore.Mvc.TestCommon": { "type": "build", "version": "1.0.0-*" diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/project.json b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/project.json index dac4d3f963..f7bc2e2b76 100644 --- a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/project.json +++ b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/project.json @@ -21,13 +21,13 @@ "FiltersWebSite": "1.0.0", "FormatterWebSite": "1.0.0", "HtmlGenerationWebSite": "1.0.0", - "Microsoft.AspNetCore.Mvc": "1.0.1-*", - "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.1-*", + "Microsoft.AspNetCore.Mvc": "1.0.1", + "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.1", "Microsoft.AspNetCore.Mvc.TestCommon": { "version": "1.0.0-*", "type": "build" }, - "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.1-*", + "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.1", "Microsoft.AspNetCore.TestHost": "1.0.0", "Microsoft.AspNetCore.WebUtilities": "1.0.0", "Microsoft.Extensions.Configuration.Json": "1.0.0", diff --git a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/project.json b/test/Microsoft.AspNetCore.Mvc.IntegrationTests/project.json index 8bc6eacfbc..0268a2bd95 100644 --- a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/project.json +++ b/test/Microsoft.AspNetCore.Mvc.IntegrationTests/project.json @@ -5,8 +5,8 @@ "dependencies": { "dotnet-test-xunit": "1.0.0-rc3-000000-01", "Microsoft.AspNetCore.Http": "1.0.0", - "Microsoft.AspNetCore.Mvc": "1.0.1-*", - "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.1-*", + "Microsoft.AspNetCore.Mvc": "1.0.1", + "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.1", "Microsoft.AspNetCore.Mvc.TestCommon": { "version": "1.0.0-*", "type": "build" diff --git a/test/Microsoft.AspNetCore.Mvc.Localization.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Localization.Test/project.json index 3a2a7c9b07..e7d918afe7 100644 --- a/test/Microsoft.AspNetCore.Mvc.Localization.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.Localization.Test/project.json @@ -4,9 +4,9 @@ }, "dependencies": { "dotnet-test-xunit": "1.0.0-rc3-000000-01", - "Microsoft.AspNetCore.Mvc": "1.0.1-*", - "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.1-*", - "Microsoft.AspNetCore.Mvc.Localization": "1.0.1-*", + "Microsoft.AspNetCore.Mvc": "1.0.1", + "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.1", + "Microsoft.AspNetCore.Mvc.Localization": "1.0.1", "Microsoft.AspNetCore.Mvc.TestCommon": { "version": "1.0.0-*", "type": "build" diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/project.json index eb0973a259..87fb91f6b1 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Host.Test/project.json @@ -1,16 +1,16 @@ { "dependencies": { "dotnet-test-xunit": "1.0.0-rc3-000000-01", - "Microsoft.AspNetCore.Mvc.Core": "1.0.1-*", - "Microsoft.AspNetCore.Mvc.DataAnnotations": "1.0.1-*", - "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.1-*", - "Microsoft.AspNetCore.Mvc.Razor": "1.0.1-*", - "Microsoft.AspNetCore.Mvc.Razor.Host": "1.0.1-*", + "Microsoft.AspNetCore.Mvc.Core": "1.0.1", + "Microsoft.AspNetCore.Mvc.DataAnnotations": "1.0.1", + "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.1", + "Microsoft.AspNetCore.Mvc.Razor": "1.0.1", + "Microsoft.AspNetCore.Mvc.Razor.Host": "1.0.1", "Microsoft.AspNetCore.Mvc.TestCommon": { "version": "1.0.0-*", "type": "build" }, - "Microsoft.AspNetCore.Mvc.ViewFeatures": "1.0.1-*", + "Microsoft.AspNetCore.Mvc.ViewFeatures": "1.0.1", "Microsoft.AspNetCore.Testing": "1.0.0-rtm-21431" }, "testRunner": "xunit", diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Razor.Test/project.json index 1602b2155c..396ab9c457 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Test/project.json @@ -15,10 +15,10 @@ "dependencies": { "dotnet-test-xunit": "1.0.0-rc3-000000-01", "Microsoft.AspNetCore.Http": "1.0.0", - "Microsoft.AspNetCore.Mvc": "1.0.1-*", - "Microsoft.AspNetCore.Mvc.DataAnnotations": "1.0.1-*", - "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.1-*", - "Microsoft.AspNetCore.Mvc.Razor": "1.0.1-*", + "Microsoft.AspNetCore.Mvc": "1.0.1", + "Microsoft.AspNetCore.Mvc.DataAnnotations": "1.0.1", + "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.1", + "Microsoft.AspNetCore.Mvc.Razor": "1.0.1", "Microsoft.AspNetCore.Mvc.TestCommon": { "version": "1.0.0-*", "type": "build" diff --git a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/project.json b/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/project.json index 61ae915d31..0740acd075 100644 --- a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/project.json @@ -6,9 +6,9 @@ "dependencies": { "dotnet-test-xunit": "1.0.0-rc3-000000-01", "Microsoft.AspNetCore.Http": "1.0.0", - "Microsoft.AspNetCore.Mvc.DataAnnotations": "1.0.1-*", - "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.1-*", - "Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.1-*", + "Microsoft.AspNetCore.Mvc.DataAnnotations": "1.0.1", + "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.1", + "Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.1", "Microsoft.AspNetCore.Mvc.TestCommon": { "version": "1.0.0-*", "type": "build" diff --git a/test/Microsoft.AspNetCore.Mvc.Test/project.json b/test/Microsoft.AspNetCore.Mvc.Test/project.json index 27a7a70e21..c08cabf8d3 100644 --- a/test/Microsoft.AspNetCore.Mvc.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.Test/project.json @@ -4,8 +4,8 @@ }, "dependencies": { "dotnet-test-xunit": "1.0.0-rc3-000000-01", - "Microsoft.AspNetCore.Mvc": "1.0.1-*", - "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.1-*", + "Microsoft.AspNetCore.Mvc": "1.0.1", + "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.1", "Microsoft.Extensions.DependencyInjection": "1.0.0", "Microsoft.Extensions.Logging": "1.0.0", "xunit": "2.1.0" diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/project.json b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/project.json index 1b6e67021f..e856d7e314 100644 --- a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/project.json +++ b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/project.json @@ -6,8 +6,8 @@ "dependencies": { "dotnet-test-xunit": "1.0.0-rc3-000000-01", "Microsoft.AspNetCore.Http": "1.0.0", - "Microsoft.AspNetCore.Mvc": "1.0.1-*", - "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.1-*", + "Microsoft.AspNetCore.Mvc": "1.0.1", + "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.1", "Microsoft.AspNetCore.Mvc.TestCommon": { "version": "1.0.0-*", "type": "build" diff --git a/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/project.json b/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/project.json index 030255c3db..2c850c8961 100644 --- a/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/project.json +++ b/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/project.json @@ -5,7 +5,7 @@ "dependencies": { "dotnet-test-xunit": "1.0.0-rc3-000000-01", "Microsoft.AspNetCore.Http": "1.0.0", - "Microsoft.AspNetCore.Mvc.WebApiCompatShim": "1.0.1-*", + "Microsoft.AspNetCore.Mvc.WebApiCompatShim": "1.0.1", "Microsoft.AspNetCore.Testing": "1.0.0-rtm-21431", "Microsoft.Extensions.Logging.Testing": "1.0.0-rtm-21431", "Microsoft.Extensions.DependencyInjection": "1.0.0", diff --git a/test/WebSites/ApiExplorerWebSite/project.json b/test/WebSites/ApiExplorerWebSite/project.json index bc41121ec5..d82fba85f5 100644 --- a/test/WebSites/ApiExplorerWebSite/project.json +++ b/test/WebSites/ApiExplorerWebSite/project.json @@ -6,9 +6,9 @@ "dependencies": { "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0", - "Microsoft.AspNetCore.Mvc": "1.0.1-*", - "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.1-*", - "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.1-*", + "Microsoft.AspNetCore.Mvc": "1.0.1", + "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.1", + "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.1", "Microsoft.AspNetCore.StaticFiles": "1.0.0" }, "frameworks": { diff --git a/test/WebSites/ApplicationModelWebSite/project.json b/test/WebSites/ApplicationModelWebSite/project.json index 8413509f12..0a92a2345f 100644 --- a/test/WebSites/ApplicationModelWebSite/project.json +++ b/test/WebSites/ApplicationModelWebSite/project.json @@ -6,8 +6,8 @@ "dependencies": { "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0", - "Microsoft.AspNetCore.Mvc": "1.0.1-*", - "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.1-*", + "Microsoft.AspNetCore.Mvc": "1.0.1", + "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.1", "Microsoft.AspNetCore.StaticFiles": "1.0.0" }, "frameworks": { diff --git a/test/WebSites/BasicWebSite/project.json b/test/WebSites/BasicWebSite/project.json index e1f87348b9..8f8775fda2 100644 --- a/test/WebSites/BasicWebSite/project.json +++ b/test/WebSites/BasicWebSite/project.json @@ -4,9 +4,9 @@ "preserveCompilationContext": true }, "dependencies": { - "Microsoft.AspNetCore.Mvc": "1.0.1-*", - "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.1-*", - "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.1-*", + "Microsoft.AspNetCore.Mvc": "1.0.1", + "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.1", + "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.1", "Microsoft.AspNetCore.Razor.Tools": { "type": "build", "version": "1.0.0-preview2-final" diff --git a/test/WebSites/ControllersFromServicesClassLibrary/project.json b/test/WebSites/ControllersFromServicesClassLibrary/project.json index 5a48992f2b..3a4e4bddff 100644 --- a/test/WebSites/ControllersFromServicesClassLibrary/project.json +++ b/test/WebSites/ControllersFromServicesClassLibrary/project.json @@ -3,7 +3,7 @@ "preserveCompilationContext": true }, "dependencies": { - "Microsoft.AspNetCore.Mvc": "1.0.1-*" + "Microsoft.AspNetCore.Mvc": "1.0.1" }, "frameworks": { "net451": {}, diff --git a/test/WebSites/ControllersFromServicesWebSite/project.json b/test/WebSites/ControllersFromServicesWebSite/project.json index cafa6721c8..ab0f0194fe 100644 --- a/test/WebSites/ControllersFromServicesWebSite/project.json +++ b/test/WebSites/ControllersFromServicesWebSite/project.json @@ -4,8 +4,8 @@ }, "dependencies": { "ControllersFromServicesClassLibrary": "1.0.0", - "Microsoft.AspNetCore.Mvc": "1.0.1-*", - "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.1-*", + "Microsoft.AspNetCore.Mvc": "1.0.1", + "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.1", "Microsoft.AspNetCore.Razor.Tools": { "type": "build", "version": "1.0.0-preview2-final" diff --git a/test/WebSites/CorsWebSite/project.json b/test/WebSites/CorsWebSite/project.json index 99be39b191..0766b75e52 100644 --- a/test/WebSites/CorsWebSite/project.json +++ b/test/WebSites/CorsWebSite/project.json @@ -12,9 +12,9 @@ "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0", "Microsoft.AspNetCore.Cors": "1.0.0", - "Microsoft.AspNetCore.Mvc": "1.0.1-*", - "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.1-*", - "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.1-*", + "Microsoft.AspNetCore.Mvc": "1.0.1", + "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.1", + "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.1", "Microsoft.AspNetCore.StaticFiles": "1.0.0" }, "frameworks": { diff --git a/test/WebSites/ErrorPageMiddlewareWebSite/project.json b/test/WebSites/ErrorPageMiddlewareWebSite/project.json index 5d375931ec..1ab48e23aa 100644 --- a/test/WebSites/ErrorPageMiddlewareWebSite/project.json +++ b/test/WebSites/ErrorPageMiddlewareWebSite/project.json @@ -7,8 +7,8 @@ "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0", "Microsoft.AspNetCore.Diagnostics": "1.0.0", - "Microsoft.AspNetCore.Mvc": "1.0.1-*", - "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.1-*", + "Microsoft.AspNetCore.Mvc": "1.0.1", + "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.1", "Microsoft.AspNetCore.StaticFiles": "1.0.0" }, "frameworks": { diff --git a/test/WebSites/FilesWebSite/project.json b/test/WebSites/FilesWebSite/project.json index 8ad81c37e6..91daa1f2d7 100644 --- a/test/WebSites/FilesWebSite/project.json +++ b/test/WebSites/FilesWebSite/project.json @@ -9,8 +9,8 @@ "dependencies": { "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0", - "Microsoft.AspNetCore.Mvc": "1.0.1-*", - "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.1-*", + "Microsoft.AspNetCore.Mvc": "1.0.1", + "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.1", "Microsoft.AspNetCore.StaticFiles": "1.0.0", "Microsoft.Extensions.FileProviders.Embedded": "1.0.0" }, diff --git a/test/WebSites/FiltersWebSite/project.json b/test/WebSites/FiltersWebSite/project.json index ab286e5003..3c006aca2d 100644 --- a/test/WebSites/FiltersWebSite/project.json +++ b/test/WebSites/FiltersWebSite/project.json @@ -7,9 +7,9 @@ "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0", "Microsoft.AspNetCore.Authentication": "1.0.0", - "Microsoft.AspNetCore.Mvc": "1.0.1-*", - "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.1-*", - "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.1-*", + "Microsoft.AspNetCore.Mvc": "1.0.1", + "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.1", + "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.1", "Microsoft.AspNetCore.StaticFiles": "1.0.0" }, "frameworks": { diff --git a/test/WebSites/FormatterWebSite/project.json b/test/WebSites/FormatterWebSite/project.json index bc41121ec5..d82fba85f5 100644 --- a/test/WebSites/FormatterWebSite/project.json +++ b/test/WebSites/FormatterWebSite/project.json @@ -6,9 +6,9 @@ "dependencies": { "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0", - "Microsoft.AspNetCore.Mvc": "1.0.1-*", - "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.1-*", - "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.1-*", + "Microsoft.AspNetCore.Mvc": "1.0.1", + "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.1", + "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.1", "Microsoft.AspNetCore.StaticFiles": "1.0.0" }, "frameworks": { diff --git a/test/WebSites/HtmlGenerationWebSite/project.json b/test/WebSites/HtmlGenerationWebSite/project.json index 54d6f1acfb..432bd6c0d4 100644 --- a/test/WebSites/HtmlGenerationWebSite/project.json +++ b/test/WebSites/HtmlGenerationWebSite/project.json @@ -4,15 +4,15 @@ "preserveCompilationContext": true }, "dependencies": { - "Microsoft.AspNetCore.Mvc": "1.0.1-*", - "Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.1-*", + "Microsoft.AspNetCore.Mvc": "1.0.1", + "Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.1", "Microsoft.AspNetCore.Razor.Tools": { "type": "build", "version": "1.0.0-preview2-final" }, "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0", - "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.1-*" + "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.1" }, "frameworks": { "net451": {}, diff --git a/test/WebSites/Microsoft.AspNetCore.Mvc.TestConfiguration/project.json b/test/WebSites/Microsoft.AspNetCore.Mvc.TestConfiguration/project.json index b0fea3a354..b30a0a238a 100644 --- a/test/WebSites/Microsoft.AspNetCore.Mvc.TestConfiguration/project.json +++ b/test/WebSites/Microsoft.AspNetCore.Mvc.TestConfiguration/project.json @@ -1,5 +1,5 @@ { - "version": "1.0.1-*", + "version": "1.0.1", "dependencies": { "Microsoft.AspNetCore.Http": "1.0.0", "Microsoft.AspNetCore.Http.Extensions": "1.0.0", diff --git a/test/WebSites/RazorPageExecutionInstrumentationWebSite/project.json b/test/WebSites/RazorPageExecutionInstrumentationWebSite/project.json index cbed043b02..23cf58b11d 100644 --- a/test/WebSites/RazorPageExecutionInstrumentationWebSite/project.json +++ b/test/WebSites/RazorPageExecutionInstrumentationWebSite/project.json @@ -4,8 +4,8 @@ "preserveCompilationContext": true }, "dependencies": { - "Microsoft.AspNetCore.Mvc": "1.0.1-*", - "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.1-*", + "Microsoft.AspNetCore.Mvc": "1.0.1", + "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.1", "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0", "Microsoft.AspNetCore.StaticFiles": "1.0.0", diff --git a/test/WebSites/RazorWebSite/project.json b/test/WebSites/RazorWebSite/project.json index 3710b1437e..3d141ba489 100644 --- a/test/WebSites/RazorWebSite/project.json +++ b/test/WebSites/RazorWebSite/project.json @@ -12,9 +12,9 @@ }, "dependencies": { "Microsoft.AspNetCore.Localization": "1.0.0", - "Microsoft.AspNetCore.Mvc": "1.0.1-*", - "Microsoft.AspNetCore.Mvc.Localization": "1.0.1-*", - "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.1-*", + "Microsoft.AspNetCore.Mvc": "1.0.1", + "Microsoft.AspNetCore.Mvc.Localization": "1.0.1", + "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.1", "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0", "Microsoft.AspNetCore.StaticFiles": "1.0.0" diff --git a/test/WebSites/RoutingWebSite/project.json b/test/WebSites/RoutingWebSite/project.json index f460e2ef69..15b7aff431 100644 --- a/test/WebSites/RoutingWebSite/project.json +++ b/test/WebSites/RoutingWebSite/project.json @@ -4,8 +4,8 @@ "preserveCompilationContext": true }, "dependencies": { - "Microsoft.AspNetCore.Mvc": "1.0.1-*", - "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.1-*", + "Microsoft.AspNetCore.Mvc": "1.0.1", + "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.1", "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0", "Microsoft.AspNetCore.StaticFiles": "1.0.0" diff --git a/test/WebSites/SimpleWebSite/project.json b/test/WebSites/SimpleWebSite/project.json index a36a8aaa47..07333befb1 100644 --- a/test/WebSites/SimpleWebSite/project.json +++ b/test/WebSites/SimpleWebSite/project.json @@ -4,7 +4,7 @@ "preserveCompilationContext": true }, "dependencies": { - "Microsoft.AspNetCore.Mvc": "1.0.1-*", + "Microsoft.AspNetCore.Mvc": "1.0.1", "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0" }, diff --git a/test/WebSites/TagHelpersWebSite/project.json b/test/WebSites/TagHelpersWebSite/project.json index 7a9f9e9025..c79dcd9ceb 100644 --- a/test/WebSites/TagHelpersWebSite/project.json +++ b/test/WebSites/TagHelpersWebSite/project.json @@ -6,8 +6,8 @@ "preserveCompilationContext": true }, "dependencies": { - "Microsoft.AspNetCore.Mvc": "1.0.1-*", - "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.1-*", + "Microsoft.AspNetCore.Mvc": "1.0.1", + "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.1", "Microsoft.AspNetCore.Razor.Tools": { "type": "build", "version": "1.0.0-preview2-final" diff --git a/test/WebSites/VersioningWebSite/project.json b/test/WebSites/VersioningWebSite/project.json index f460e2ef69..15b7aff431 100644 --- a/test/WebSites/VersioningWebSite/project.json +++ b/test/WebSites/VersioningWebSite/project.json @@ -4,8 +4,8 @@ "preserveCompilationContext": true }, "dependencies": { - "Microsoft.AspNetCore.Mvc": "1.0.1-*", - "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.1-*", + "Microsoft.AspNetCore.Mvc": "1.0.1", + "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.1", "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0", "Microsoft.AspNetCore.StaticFiles": "1.0.0" diff --git a/test/WebSites/WebApiCompatShimWebSite/project.json b/test/WebSites/WebApiCompatShimWebSite/project.json index 3876773e51..97182bdcdb 100644 --- a/test/WebSites/WebApiCompatShimWebSite/project.json +++ b/test/WebSites/WebApiCompatShimWebSite/project.json @@ -4,9 +4,9 @@ "preserveCompilationContext": true }, "dependencies": { - "Microsoft.AspNetCore.Mvc": "1.0.1-*", - "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.1-*", - "Microsoft.AspNetCore.Mvc.WebApiCompatShim": "1.0.1-*", + "Microsoft.AspNetCore.Mvc": "1.0.1", + "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.1", + "Microsoft.AspNetCore.Mvc.WebApiCompatShim": "1.0.1", "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0", "Microsoft.AspNetCore.StaticFiles": "1.0.0" diff --git a/test/WebSites/XmlFormattersWebSite/project.json b/test/WebSites/XmlFormattersWebSite/project.json index dc5054ee25..3f50ad6757 100644 --- a/test/WebSites/XmlFormattersWebSite/project.json +++ b/test/WebSites/XmlFormattersWebSite/project.json @@ -4,9 +4,9 @@ "preserveCompilationContext": true }, "dependencies": { - "Microsoft.AspNetCore.Mvc": "1.0.1-*", - "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.1-*", - "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.1-*", + "Microsoft.AspNetCore.Mvc": "1.0.1", + "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.1", + "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.1", "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0", "Microsoft.AspNetCore.StaticFiles": "1.0.0" From f0732e9e214d72db813acf6df4e7b2036ca1b8b0 Mon Sep 17 00:00:00 2001 From: jacalvar Date: Mon, 25 Jul 2016 16:49:01 -0700 Subject: [PATCH 2/2] [Fixes #5038] HTTP Verbs mapping error GET and DELETE When an action contained an attribute derived from HttpMethodAttribute, doesn't specify an attribute route and there is also another attribute extending HttpMethodAttribute that has a route defined on it; we ignored the HttpMethodAttribute attribute without a defined route when building the set of action selectors for the method. This caused the resulting action to be unbounded and to accept requests for other verbs not associated with it. The root cause of the problem was that attributes override equality and do a field by field comparison but ignore fields in the base classes of the type, so if an attribute is part of a class hierarchy (like Http*Attributes) there might be two different attributes that get considered equal. The fix for the problem has been to change using Contains on a couple of collections (that uses the equals method on the underlying object) and check for the existence of the attribute on the collection directly by using reference equality. --- .../DefaultApplicationModelProvider.cs | 38 ++++++++++-- .../DefaultApplicationModelProviderTest.cs | 40 ++++++++++++ .../RoutingTests.cs | 62 ++++++++++++++++++- .../Controllers/FriendsController.cs | 31 ++++++++++ 4 files changed, 166 insertions(+), 5 deletions(-) create mode 100644 test/WebSites/RoutingWebSite/Controllers/FriendsController.cs diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultApplicationModelProvider.cs b/src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultApplicationModelProvider.cs index 9b9c345df0..ccfead7293 100644 --- a/src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultApplicationModelProvider.cs +++ b/src/Microsoft.AspNetCore.Mvc.Core/Internal/DefaultApplicationModelProvider.cs @@ -293,7 +293,7 @@ namespace Microsoft.AspNetCore.Mvc.Internal { actionModel.RouteValues.Add(routeValueProvider.RouteKey, routeValueProvider.RouteValue); } - + //TODO: modify comment // Now we need to determine the action selection info (cross-section of routes and constraints) // @@ -468,6 +468,16 @@ namespace Microsoft.AspNetCore.Mvc.Internal // 1. [HttpPost("Api/Things")] // 2. [HttpGet], [AcceptVerbs("POST", "PUT")] // + // Another example of this situation is: + // + // [Route("api/Products")] + // [AcceptVerbs("GET", "HEAD")] + // [HttpPost("api/Products/new")] + // + // This will generate 2 selectors: + // 1. [AcceptVerbs("GET", "HEAD")] + // 2. [HttpPost] + // // Note that having a route attribute that doesn't define a route template _might_ be an error. We // don't have enough context to really know at this point so we just pass it on. var routeProviders = new List(); @@ -530,18 +540,25 @@ namespace Microsoft.AspNetCore.Mvc.Internal var filteredAttributes = new List(); foreach (var attribute in attributes) { - if (attribute == routeProvider) + if (ReferenceEquals(attribute, routeProvider)) { filteredAttributes.Add(attribute); } - else if (routeProviders.Contains(attribute)) + else if (InRouteProviders(routeProviders, attribute)) { // Exclude other route template providers + // Example: + // [HttpGet("template")] + // [Route("template/{id}")] } else if ( routeProvider is IActionHttpMethodProvider && attribute is IActionHttpMethodProvider) { + // Example: + // [HttpGet("template")] + // [AcceptVerbs("GET", "POST")] + // // Exclude other http method providers if this route is an // http method provider. } @@ -559,7 +576,7 @@ namespace Microsoft.AspNetCore.Mvc.Internal var filteredAttributes = new List(); foreach (var attribute in attributes) { - if (!routeProviders.Contains(attribute)) + if (!InRouteProviders(routeProviders, attribute)) { filteredAttributes.Add(attribute); } @@ -572,6 +589,19 @@ namespace Microsoft.AspNetCore.Mvc.Internal return selectorModels; } + private static bool InRouteProviders(List routeProviders, object attribute) + { + foreach (var rp in routeProviders) + { + if (ReferenceEquals(rp, attribute)) + { + return true; + } + } + + return false; + } + private static SelectorModel CreateSelectorModel(IRouteTemplateProvider route, IList attributes) { var selectorModel = new SelectorModel(); diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/DefaultApplicationModelProviderTest.cs b/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/DefaultApplicationModelProviderTest.cs index 5931328b24..bfe0be0051 100644 --- a/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/DefaultApplicationModelProviderTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/DefaultApplicationModelProviderTest.cs @@ -792,6 +792,29 @@ namespace Microsoft.AspNetCore.Mvc.Internal Assert.Equal(new string[] { "POST" }, methodConstraint.HttpMethods); } + [Fact] + public void CreateActionModel_MixedHttpVerbsAndRoutes_WithRouteOnController() + { + // Arrange + var builder = new TestApplicationModelProvider(); + var typeInfo = typeof(RouteAttributeOnController).GetTypeInfo(); + var actionName = nameof(RouteAttributeOnController.Get); + + // Act + var action = builder.CreateActionModel(typeInfo, typeInfo.AsType().GetMethod(actionName)); + + // Assert + Assert.Equal(2, action.Selectors.Count); + + var selectorModel = Assert.Single(action.Selectors, s => s.AttributeRouteModel == null); + var methodConstraint = Assert.Single(selectorModel.ActionConstraints.OfType()); + Assert.Equal(new string[] { "GET" }, methodConstraint.HttpMethods); + + selectorModel = Assert.Single(action.Selectors, s => s.AttributeRouteModel?.Template == "id/{id?}"); + methodConstraint = Assert.Single(selectorModel.ActionConstraints.OfType()); + Assert.Equal(new string[] { "GET" }, methodConstraint.HttpMethods); + } + [Fact] public void CreateActionModel_MixedHttpVerbsAndRoutes_MultipleEmptyAndNonEmptyVerbs() { @@ -1124,6 +1147,23 @@ namespace Microsoft.AspNetCore.Mvc.Internal public void Invalid() { } } + [Route("api/[controller]")] + private class RouteAttributeOnController : Controller + { + [HttpGet] + [HttpGet("id/{id?}")] + public object Get(short? id) + { + return null; + } + + [HttpDelete("{id}")] + public object Delete(int id) + { + return null; + } + } + // Here the constraints on the methods are acting as an IActionHttpMethodProvider and // not as an IRouteTemplateProvider given that there is no RouteAttribute // on the controller and the template for all the constraints on a method is null. diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RoutingTests.cs b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RoutingTests.cs index 055824a4b5..c3ee4d0757 100644 --- a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RoutingTests.cs +++ b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/RoutingTests.cs @@ -157,6 +157,66 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests result.RouteValues); } + [Theory] + [InlineData("Get", "/Friends")] + [InlineData("Get", "/Friends/Peter")] + [InlineData("Delete", "/Friends")] + public async Task AttributeRoutedAction_AcceptRequestsWithValidMethods_InRoutesWithoutExtraTemplateSegmentsOnTheAction( + string method, + string url) + { + // Arrange + var request = new HttpRequestMessage(new HttpMethod(method), $"http://localhost{url}"); + + // Assert + var response = await Client.SendAsync(request); + + // Assert + Assert.Equal(HttpStatusCode.OK, response.StatusCode); + + var body = await response.Content.ReadAsStringAsync(); + var result = JsonConvert.DeserializeObject(body); + + Assert.Contains(url, result.ExpectedUrls); + Assert.Equal("Friends", result.Controller); + Assert.Equal(method, result.Action); + + Assert.Contains( + new KeyValuePair("controller", "Friends"), + result.RouteValues); + + Assert.Contains( + new KeyValuePair("action", method), + result.RouteValues); + + if (result.RouteValues.ContainsKey("id")) + { + Assert.Contains( + new KeyValuePair("id", "Peter"), + result.RouteValues); + } + } + + [Theory] + [InlineData("Post", "/Friends")] + [InlineData("Put", "/Friends")] + [InlineData("Patch", "/Friends")] + [InlineData("Options", "/Friends")] + [InlineData("Head", "/Friends")] + public async Task AttributeRoutedAction_RejectsRequestsWithWrongMethods_InRoutesWithoutExtraTemplateSegmentsOnTheAction( + string method, + string url) + { + // Arrange + var request = new HttpRequestMessage(new HttpMethod(method), $"http://localhost{url}"); + + // Assert + var response = await Client.SendAsync(request); + + // Assert + Assert.Equal(HttpStatusCode.NotFound, response.StatusCode); + } + [Theory] [InlineData("http://localhost/api/v1/Maps")] [InlineData("http://localhost/api/v2/Maps")] @@ -1190,7 +1250,7 @@ namespace Microsoft.AspNetCore.Mvc.FunctionalTests return Url + "?" + string.Join("&", Values.Select(kvp => kvp.Key + "=" + kvp.Value)); } - public static implicit operator string (LinkBuilder builder) + public static implicit operator string(LinkBuilder builder) { return builder.ToString(); } diff --git a/test/WebSites/RoutingWebSite/Controllers/FriendsController.cs b/test/WebSites/RoutingWebSite/Controllers/FriendsController.cs new file mode 100644 index 0000000000..b6f3779e2d --- /dev/null +++ b/test/WebSites/RoutingWebSite/Controllers/FriendsController.cs @@ -0,0 +1,31 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using Microsoft.AspNetCore.Mvc; + +namespace RoutingWebSite +{ + [Route("Friends")] + public class FriendsController : Controller + { + private readonly TestResponseGenerator _generator; + + public FriendsController(TestResponseGenerator generator) + { + _generator = generator; + } + + [HttpGet] + [HttpGet("{id}")] + public IActionResult Get([FromRoute]string id) + { + return _generator.Generate(id == null ? "/Friends" : $"/Friends/{id}"); + } + + [HttpDelete] + public IActionResult Delete() + { + return _generator.Generate("/Friends"); + } + } +}