From 998a47d26565936611bdb1ae5be3522e4bf3040a Mon Sep 17 00:00:00 2001 From: jacalvar Date: Tue, 19 Jul 2016 11:08:29 -0700 Subject: [PATCH 1/4] [Fixes #4960] Action results returned from controller actions rendered as json instead of executed --- .../Internal/ControllerActionInvoker.cs | 4 +- .../Internal/ControllerActionInvokerTest.cs | 62 +++++++++++++++++++ .../Controllers/HomeController.cs | 4 +- 3 files changed, 67 insertions(+), 3 deletions(-) diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerActionInvoker.cs b/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerActionInvoker.cs index 084ec71ef6..404c9267eb 100644 --- a/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerActionInvoker.cs +++ b/src/Microsoft.AspNetCore.Mvc.Core/Internal/ControllerActionInvoker.cs @@ -641,7 +641,7 @@ namespace Microsoft.AspNetCore.Mvc.Internal else if (!_executor.IsMethodAsync) { var resultAsObject = _executor.Execute(_controller, arguments); - result = new ObjectResult(resultAsObject) + result = resultAsObject as IActionResult ?? new ObjectResult(resultAsObject) { DeclaredType = returnType, }; @@ -649,7 +649,7 @@ namespace Microsoft.AspNetCore.Mvc.Internal else if (_executor.TaskGenericType != null) { var resultAsObject = await _executor.ExecuteAsync(_controller, arguments); - result = new ObjectResult(resultAsObject) + result = resultAsObject as IActionResult ?? new ObjectResult(resultAsObject) { DeclaredType = _executor.TaskGenericType, }; diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ControllerActionInvokerTest.cs b/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ControllerActionInvokerTest.cs index c695754142..a8eee7f282 100644 --- a/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ControllerActionInvokerTest.cs +++ b/test/Microsoft.AspNetCore.Mvc.Core.Test/Internal/ControllerActionInvokerTest.cs @@ -2356,6 +2356,58 @@ namespace Microsoft.AspNetCore.Mvc.Internal Assert.IsType(result); } + [Fact] + public async Task InvokeAction_AsyncActionWithTaskOfObjectReturnType_AndReturningTaskOfActionResult() + { + // Arrange + var actionParameters = new Dictionary { ["value"] = 3 }; + IActionResult result = null; + + var filter = new Mock(MockBehavior.Strict); + filter.Setup(f => f.OnActionExecuting(It.IsAny())).Verifiable(); + filter + .Setup(f => f.OnActionExecuted(It.IsAny())) + .Callback(c => result = c.Result); + + var invoker = CreateInvoker( + new[] { filter.Object }, + nameof(TestController.AsyncActionMethodReturningActionResultWithTaskOfObjectAsReturnType), + actionParameters); + + // Act + await invoker.InvokeAsync(); + + // Assert + var testResult = Assert.IsType(result); + Assert.Equal(3, testResult.Value); + } + + [Fact] + public async Task InvokeAction_ActionWithObjectReturnType_AndReturningActionResult() + { + // Arrange + var actionParameters = new Dictionary { ["value"] = 3 }; + IActionResult result = null; + + var filter = new Mock(MockBehavior.Strict); + filter.Setup(f => f.OnActionExecuting(It.IsAny())).Verifiable(); + filter + .Setup(f => f.OnActionExecuted(It.IsAny())) + .Callback(c => result = c.Result); + + var invoker = CreateInvoker( + new[] { filter.Object }, + nameof(TestController.ActionMethodReturningActionResultWithObjectAsReturnType), + actionParameters); + + // Act + await invoker.InvokeAsync(); + + // Assert + var testResult = Assert.IsType(result); + Assert.Equal(3, testResult.Value); + } + [Fact] public async Task InvokeAction_AsyncMethod_ParametersInRandomOrder() { @@ -2908,6 +2960,16 @@ namespace Microsoft.AspNetCore.Mvc.Internal return null; } + public object ActionMethodReturningActionResultWithObjectAsReturnType(int value = 5) + { + return new TestActionResult { Value = value }; + } + + public async Task AsyncActionMethodReturningActionResultWithTaskOfObjectAsReturnType(int value = 5) + { + return await Task.FromResult(new TestActionResult { Value = value }); + } + public TestActionResult TestActionMethodWithNullActionResult() { return null; diff --git a/test/WebSites/BasicWebSite/Controllers/HomeController.cs b/test/WebSites/BasicWebSite/Controllers/HomeController.cs index fa2a854aae..48e1aa850c 100644 --- a/test/WebSites/BasicWebSite/Controllers/HomeController.cs +++ b/test/WebSites/BasicWebSite/Controllers/HomeController.cs @@ -16,7 +16,9 @@ namespace BasicWebSite.Controllers return View(); } - public IActionResult PlainView() + // Keep the return type as object to ensure that we don't + // wrap IActionResult instances into ObjectResults. + public object PlainView() { return View(); } From f02f55c33d09206e75547061d526e1e99a3825c8 Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Fri, 28 Oct 2016 16:21:50 -0700 Subject: [PATCH 2/4] Antiforgery goes at the end of filters --- Mvc.sln | 15 +++++ .../AutoValidateAntiforgeryTokenAttribute.cs | 19 +++++- .../ValidateAntiForgeryTokenAttribute.cs | 19 +++++- .../AntiforgeryAuthTests.cs | 45 +++++++++++++ .../project.json | 1 + .../Controllers/HomeController.cs | 41 ++++++++++++ test/WebSites/SecurityWebSite/Program.cs | 22 +++++++ .../SecurityWebSite/SecurityWebSite.xproj | 23 +++++++ test/WebSites/SecurityWebSite/Startup.cs | 63 +++++++++++++++++++ .../SecurityWebSite/Views/Home/Index.cshtml | 21 +++++++ .../Views/Shared/_Layout.cshtml | 37 +++++++++++ .../SecurityWebSite/Views/_ViewImports.cshtml | 2 + .../SecurityWebSite/Views/_ViewStart.cshtml | 3 + .../WebSites/SecurityWebSite/appsettings.json | 10 +++ test/WebSites/SecurityWebSite/project.json | 48 ++++++++++++++ test/WebSites/SecurityWebSite/web.config | 14 +++++ 16 files changed, 379 insertions(+), 4 deletions(-) create mode 100644 test/Microsoft.AspNetCore.Mvc.FunctionalTests/AntiforgeryAuthTests.cs create mode 100644 test/WebSites/SecurityWebSite/Controllers/HomeController.cs create mode 100644 test/WebSites/SecurityWebSite/Program.cs create mode 100644 test/WebSites/SecurityWebSite/SecurityWebSite.xproj create mode 100644 test/WebSites/SecurityWebSite/Startup.cs create mode 100644 test/WebSites/SecurityWebSite/Views/Home/Index.cshtml create mode 100644 test/WebSites/SecurityWebSite/Views/Shared/_Layout.cshtml create mode 100644 test/WebSites/SecurityWebSite/Views/_ViewImports.cshtml create mode 100644 test/WebSites/SecurityWebSite/Views/_ViewStart.cshtml create mode 100644 test/WebSites/SecurityWebSite/appsettings.json create mode 100644 test/WebSites/SecurityWebSite/project.json create mode 100644 test/WebSites/SecurityWebSite/web.config diff --git a/Mvc.sln b/Mvc.sln index 8c6313883b..65ac025971 100644 --- a/Mvc.sln +++ b/Mvc.sln @@ -123,6 +123,8 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "MvcSandbox", "samples\MvcSa EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "SimpleWebSite", "test\WebSites\SimpleWebSite\SimpleWebSite.xproj", "{396B40D7-AC70-49A7-B33C-ED42129FEBE3}" EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "SecurityWebSite", "test\WebSites\SecurityWebSite\SecurityWebSite.xproj", "{D28CAC79-7004-4B69-993B-EDEB4653BFA8}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -727,6 +729,18 @@ Global {396B40D7-AC70-49A7-B33C-ED42129FEBE3}.Release|Mixed Platforms.Build.0 = Release|Any CPU {396B40D7-AC70-49A7-B33C-ED42129FEBE3}.Release|x86.ActiveCfg = Release|Any CPU {396B40D7-AC70-49A7-B33C-ED42129FEBE3}.Release|x86.Build.0 = Release|Any CPU + {D28CAC79-7004-4B69-993B-EDEB4653BFA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D28CAC79-7004-4B69-993B-EDEB4653BFA8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D28CAC79-7004-4B69-993B-EDEB4653BFA8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {D28CAC79-7004-4B69-993B-EDEB4653BFA8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {D28CAC79-7004-4B69-993B-EDEB4653BFA8}.Debug|x86.ActiveCfg = Debug|Any CPU + {D28CAC79-7004-4B69-993B-EDEB4653BFA8}.Debug|x86.Build.0 = Debug|Any CPU + {D28CAC79-7004-4B69-993B-EDEB4653BFA8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D28CAC79-7004-4B69-993B-EDEB4653BFA8}.Release|Any CPU.Build.0 = Release|Any CPU + {D28CAC79-7004-4B69-993B-EDEB4653BFA8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {D28CAC79-7004-4B69-993B-EDEB4653BFA8}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {D28CAC79-7004-4B69-993B-EDEB4653BFA8}.Release|x86.ActiveCfg = Release|Any CPU + {D28CAC79-7004-4B69-993B-EDEB4653BFA8}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -787,5 +801,6 @@ Global {9879B5D5-2325-4A81-B4DF-F279FE8FEEB4} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} {14ED4476-9F24-4776-8417-EA6927F6C9C9} = {DAAE4C74-D06F-4874-A166-33305D2643CE} {396B40D7-AC70-49A7-B33C-ED42129FEBE3} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C} + {D28CAC79-7004-4B69-993B-EDEB4653BFA8} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C} EndGlobalSection EndGlobal diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/AutoValidateAntiforgeryTokenAttribute.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/AutoValidateAntiforgeryTokenAttribute.cs index e40fea31ad..64015f7d8b 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/AutoValidateAntiforgeryTokenAttribute.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/AutoValidateAntiforgeryTokenAttribute.cs @@ -21,8 +21,23 @@ namespace Microsoft.AspNetCore.Mvc [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = false, Inherited = true)] public class AutoValidateAntiforgeryTokenAttribute : Attribute, IFilterFactory, IOrderedFilter { - /// - public int Order { get; set; } + /// + /// Gets the order value for determining the order of execution of filters. Filters execute in + /// ascending numeric value of the property. + /// + /// + /// + /// Filters are executed in an ordering determined by an ascending sort of the property. + /// + /// + /// The default Order for this attribute is 1000 because it must run after any filter which does authentication + /// or login in order to allow them to behave as expected (ie Unauthenticated or Redirect instead of 400). + /// + /// + /// Look at for more detailed info. + /// + /// + public int Order { get; set; } = 1000; /// public bool IsReusable => true; diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ValidateAntiForgeryTokenAttribute.cs b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ValidateAntiForgeryTokenAttribute.cs index 938f9c160d..fcf1bd3f8f 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ValidateAntiForgeryTokenAttribute.cs +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/ValidateAntiForgeryTokenAttribute.cs @@ -20,8 +20,23 @@ namespace Microsoft.AspNetCore.Mvc [AttributeUsage(AttributeTargets.Class | AttributeTargets.Method, AllowMultiple = false, Inherited = true)] public class ValidateAntiForgeryTokenAttribute : Attribute, IFilterFactory, IOrderedFilter { - /// - public int Order { get; set; } + /// + /// Gets the order value for determining the order of execution of filters. Filters execute in + /// ascending numeric value of the property. + /// + /// + /// + /// Filters are executed in an ordering determined by an ascending sort of the property. + /// + /// + /// The default Order for this attribute is 1000 because it must run after any filter which does authentication + /// or login in order to allow them to behave as expected (ie Unauthenticated or Redirect instead of 400). + /// + /// + /// Look at for more detailed info. + /// + /// + public int Order { get; set; } = 1000; /// public bool IsReusable => true; diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/AntiforgeryAuthTests.cs b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/AntiforgeryAuthTests.cs new file mode 100644 index 0000000000..5f19fbe851 --- /dev/null +++ b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/AntiforgeryAuthTests.cs @@ -0,0 +1,45 @@ +// 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 System; +using System.Net; +using System.Net.Http; +using System.Threading.Tasks; +using SecurityWebSite; +using Xunit; + +namespace Microsoft.AspNetCore.Mvc.FunctionalTests +{ + public class AntiforgeryAuthTests : IClassFixture> + { + public AntiforgeryAuthTests(MvcTestFixture fixture) + { + Client = fixture.Client; + } + + public HttpClient Client { get; } + + [Fact] + public async Task AutomaticAuthenticationBeforeAntiforgery() + { + // Arrange & Act + var response = await Client.PostAsync("http://localhost/Home/AutoAntiforgery", null); + + // Assert + Assert.Equal(HttpStatusCode.Redirect, response.StatusCode); + Assert.Equal("/Home/Login", response.Headers.Location.AbsolutePath, StringComparer.OrdinalIgnoreCase); + } + + [Fact] + public async Task AuthBeforeAntiforgery() + { + // Arrange & Act + var response = await Client.GetAsync("http://localhost/Home/Antiforgery"); + + // Assert + // Redirected to login page, Antiforgery didn't fail yet + Assert.Equal(HttpStatusCode.Redirect, response.StatusCode); + Assert.Equal("/Home/Login", response.Headers.Location.AbsolutePath, StringComparer.OrdinalIgnoreCase); + } + } +} diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/project.json b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/project.json index f7bc2e2b76..f507dc997d 100644 --- a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/project.json +++ b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/project.json @@ -36,6 +36,7 @@ "RazorPageExecutionInstrumentationWebSite": "1.0.0", "RazorWebSite": "1.0.0", "RoutingWebSite": "1.0.0", + "SecurityWebSite": "1.0.0", "SimpleWebSite": "1.0.0", "TagHelpersWebSite": "1.0.0", "VersioningWebSite": "1.0.0", diff --git a/test/WebSites/SecurityWebSite/Controllers/HomeController.cs b/test/WebSites/SecurityWebSite/Controllers/HomeController.cs new file mode 100644 index 0000000000..2a639ae399 --- /dev/null +++ b/test/WebSites/SecurityWebSite/Controllers/HomeController.cs @@ -0,0 +1,41 @@ +// 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.Authorization; +using Microsoft.AspNetCore.Mvc; + +namespace SecurityWebSite.Controllers +{ + public class HomeController : Controller + { + public IActionResult Index() + { + return View(); + } + + [AutoValidateAntiforgeryToken] + [Authorize] + [HttpPost] + public IActionResult AutoAntiforgery() + { + return Content("Automaticaly doesn't matter"); + } + + [Authorize] + [ValidateAntiForgeryToken] + public IActionResult Antiforgery() + { + return Content("Doesn't matter"); + } + + public IActionResult Login() + { + return Content("Login!"); + } + + public IActionResult Logout() + { + return Content("Logout!"); + } + } +} diff --git a/test/WebSites/SecurityWebSite/Program.cs b/test/WebSites/SecurityWebSite/Program.cs new file mode 100644 index 0000000000..e9748d7609 --- /dev/null +++ b/test/WebSites/SecurityWebSite/Program.cs @@ -0,0 +1,22 @@ +// 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 System.IO; +using Microsoft.AspNetCore.Hosting; + +namespace SecurityWebSite +{ + public class Program + { + public static void Main(string[] args) + { + var host = new WebHostBuilder() + .UseKestrel() + .UseContentRoot(Directory.GetCurrentDirectory()) + .UseStartup() + .Build(); + + host.Run(); + } + } +} diff --git a/test/WebSites/SecurityWebSite/SecurityWebSite.xproj b/test/WebSites/SecurityWebSite/SecurityWebSite.xproj new file mode 100644 index 0000000000..fc7b205954 --- /dev/null +++ b/test/WebSites/SecurityWebSite/SecurityWebSite.xproj @@ -0,0 +1,23 @@ + + + + 14.0 + $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) + + + + d28cac79-7004-4b69-993b-edeb4653bfa8 + AjaxAntiForgeryValidation + .\obj + .\bin\ + v4.5.2 + + + 2.0 + + + + + + + diff --git a/test/WebSites/SecurityWebSite/Startup.cs b/test/WebSites/SecurityWebSite/Startup.cs new file mode 100644 index 0000000000..fe7fa7b9f2 --- /dev/null +++ b/test/WebSites/SecurityWebSite/Startup.cs @@ -0,0 +1,63 @@ +// 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.Builder; +using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; + +namespace SecurityWebSite +{ + public class Startup + { + public Startup(IHostingEnvironment env) + { + var builder = new ConfigurationBuilder() + .SetBasePath(env.ContentRootPath) + .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true) + .AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true) + .AddEnvironmentVariables(); + Configuration = builder.Build(); + } + + public IConfigurationRoot Configuration { get; } + + // This method gets called by the runtime. Use this method to add services to the container. + public void ConfigureServices(IServiceCollection services) + { + // Add framework services. + services.AddMvc(); + services.AddAntiforgery(); + services.AddAuthentication(); + } + + // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. + public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) + { + loggerFactory.AddConsole(Configuration.GetSection("Logging")); + loggerFactory.AddDebug(); + + if (env.IsDevelopment()) + { + app.UseDeveloperExceptionPage(); + } + + app.UseStaticFiles(); + app.UseCookieAuthentication(new CookieAuthenticationOptions + { + LoginPath = "/Home/Login", + LogoutPath = "/Home/Logout", + AutomaticAuthenticate = true, + AutomaticChallenge = true + }); + + app.UseMvc(routes => + { + routes.MapRoute( + name: "default", + template: "{controller=Home}/{action=Index}/{id?}"); + }); + } + } +} diff --git a/test/WebSites/SecurityWebSite/Views/Home/Index.cshtml b/test/WebSites/SecurityWebSite/Views/Home/Index.cshtml new file mode 100644 index 0000000000..cb0dbdf126 --- /dev/null +++ b/test/WebSites/SecurityWebSite/Views/Home/Index.cshtml @@ -0,0 +1,21 @@ +@{ + ViewData["Title"] = "Home Page"; +} +

Hello!

+ + diff --git a/test/WebSites/SecurityWebSite/Views/Shared/_Layout.cshtml b/test/WebSites/SecurityWebSite/Views/Shared/_Layout.cshtml new file mode 100644 index 0000000000..dfa4dbe9f1 --- /dev/null +++ b/test/WebSites/SecurityWebSite/Views/Shared/_Layout.cshtml @@ -0,0 +1,37 @@ + + + + + + @ViewData["Title"] - SecurityWebSite + + +
+
+
+ + SecurityWebSite +
+
+ +
+
+
+
+ @RenderBody() +
+
+

© 2016 - SecurityWebSite

+
+
+ + diff --git a/test/WebSites/SecurityWebSite/Views/_ViewImports.cshtml b/test/WebSites/SecurityWebSite/Views/_ViewImports.cshtml new file mode 100644 index 0000000000..f65eca4041 --- /dev/null +++ b/test/WebSites/SecurityWebSite/Views/_ViewImports.cshtml @@ -0,0 +1,2 @@ +@using SecurityWebSite + @addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers diff --git a/test/WebSites/SecurityWebSite/Views/_ViewStart.cshtml b/test/WebSites/SecurityWebSite/Views/_ViewStart.cshtml new file mode 100644 index 0000000000..a5f10045db --- /dev/null +++ b/test/WebSites/SecurityWebSite/Views/_ViewStart.cshtml @@ -0,0 +1,3 @@ +@{ + Layout = "_Layout"; +} diff --git a/test/WebSites/SecurityWebSite/appsettings.json b/test/WebSites/SecurityWebSite/appsettings.json new file mode 100644 index 0000000000..fa8ce71a97 --- /dev/null +++ b/test/WebSites/SecurityWebSite/appsettings.json @@ -0,0 +1,10 @@ +{ + "Logging": { + "IncludeScopes": false, + "LogLevel": { + "Default": "Debug", + "System": "Information", + "Microsoft": "Information" + } + } +} diff --git a/test/WebSites/SecurityWebSite/project.json b/test/WebSites/SecurityWebSite/project.json new file mode 100644 index 0000000000..a1bfa558d5 --- /dev/null +++ b/test/WebSites/SecurityWebSite/project.json @@ -0,0 +1,48 @@ +{ + "buildOptions": { + "emitEntryPoint": true, + "preserveCompilationContext": true + }, + "dependencies": { + "Microsoft.Extensions.Logging.Debug": "1.1.0-*", + "Microsoft.Extensions.Logging.Console": "1.1.0-*", + "Microsoft.Extensions.Configuration.Json": "1.1.0-*", + "Microsoft.Extensions.Configuration.FileExtensions": "1.1.0-*", + "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.0-*", + "Microsoft.Extensions.Configuration": "1.1.0-*", + "Microsoft.AspNetCore.StaticFiles": "1.1.0-*", + "Microsoft.AspNetCore.Server.Kestrel": "1.1.0-*", + "Microsoft.AspNetCore.Mvc": "1.1.0-*", + "Microsoft.AspNetCore.Mvc.ViewFeatures": "1.1.0-*", + "Microsoft.AspNetCore.Identity.EntityFrameworkCore": "1.1.0-*", + "Microsoft.AspNetCore.Identity": "1.1.0-*", + "Microsoft.AspNetCore.Hosting": "1.1.0-*", + "Microsoft.AspNetCore.Diagnostics": "1.1.0-*" + }, + "frameworks": { + "netcoreapp1.1": { + "dependencies": { + "Microsoft.NETCore.App": { + "version": "1.1.0-*", + "type": "platform" + } + }, + "imports": "portable-net451+win8" + }, + "net451": {} + }, + "publishOptions": { + "include": [ + "wwwroot", + "appsettings.json", + "web.config" + ] + }, + "scripts": { + "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ] + }, + "tools": { + "Microsoft.AspNetCore.Razor.Tools": "1.0.0-preview2-final", + "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-preview2-final" + } +} diff --git a/test/WebSites/SecurityWebSite/web.config b/test/WebSites/SecurityWebSite/web.config new file mode 100644 index 0000000000..dc0514fca5 --- /dev/null +++ b/test/WebSites/SecurityWebSite/web.config @@ -0,0 +1,14 @@ + + + + + + + + + + + + From 0c93a5e09382222a981cff9b66bf8c4aae65d402 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Thu, 3 Nov 2016 10:18:07 -0700 Subject: [PATCH 3/4] Update versions to 1.0.2 --- samples/MvcSandbox/project.json | 2 +- .../project.json | 2 +- .../project.json | 4 +-- .../project.json | 4 +-- .../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 ++-- .../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/SecurityWebSite/project.json | 28 +++++++------------ test/WebSites/SimpleWebSite/project.json | 2 +- test/WebSites/TagHelpersWebSite/project.json | 4 +-- test/WebSites/VersioningWebSite/project.json | 4 +-- .../WebApiCompatShimWebSite/project.json | 6 ++-- .../XmlFormattersWebSite/project.json | 6 ++-- 52 files changed, 133 insertions(+), 141 deletions(-) diff --git a/samples/MvcSandbox/project.json b/samples/MvcSandbox/project.json index b3bae274f1..57b967bdb8 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.2", "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 0ed02e52bc..ed3648f4b6 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.2", "packOptions": { "repository": { "type": "git", diff --git a/src/Microsoft.AspNetCore.Mvc.ApiExplorer/project.json b/src/Microsoft.AspNetCore.Mvc.ApiExplorer/project.json index 7eed7eeb99..bd00dcafd6 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.2", "packOptions": { "repository": { "type": "git", @@ -20,7 +20,7 @@ "xmlDoc": true }, "dependencies": { - "Microsoft.AspNetCore.Mvc.Core": "1.0.1", + "Microsoft.AspNetCore.Mvc.Core": "1.0.2", "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 6777f0952e..0492fd7cb6 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.2", "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.2", "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 895e457de8..4e9b028de9 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.2", "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.2" }, "frameworks": { "net451": {}, diff --git a/src/Microsoft.AspNetCore.Mvc.DataAnnotations/project.json b/src/Microsoft.AspNetCore.Mvc.DataAnnotations/project.json index f9227110dd..3bb2712185 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.2", "packOptions": { "repository": { "type": "git", @@ -20,7 +20,7 @@ "xmlDoc": true }, "dependencies": { - "Microsoft.AspNetCore.Mvc.Core": "1.0.1", + "Microsoft.AspNetCore.Mvc.Core": "1.0.2", "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 f671569e3f..427be7fc3b 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.2", "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.2", "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 cfd6203331..a23596c170 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.2", "packOptions": { "repository": { "type": "git", @@ -21,7 +21,7 @@ "xmlDoc": true }, "dependencies": { - "Microsoft.AspNetCore.Mvc.Core": "1.0.1", + "Microsoft.AspNetCore.Mvc.Core": "1.0.2", "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 c8b56d188b..d15767e35c 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.2", "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.2", "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 c659893927..548912b865 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.2", "packOptions": { "repository": { "type": "git", diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/project.json b/src/Microsoft.AspNetCore.Mvc.Razor/project.json index d955af3b00..d82b7c0a84 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.2", "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.2", + "Microsoft.AspNetCore.Mvc.ViewFeatures": "1.0.2", "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 e3d6b193e0..ef23f340a5 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.2", "packOptions": { "repository": { "type": "git", @@ -22,7 +22,7 @@ "xmlDoc": true }, "dependencies": { - "Microsoft.AspNetCore.Mvc.Razor": "1.0.1", + "Microsoft.AspNetCore.Mvc.Razor": "1.0.2", "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 aefdf7b9a4..d63926e892 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.2", "packOptions": { "repository": { "type": "git", @@ -23,9 +23,9 @@ "Microsoft.AspNetCore.Antiforgery": "1.0.1", "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.2", + "Microsoft.AspNetCore.Mvc.DataAnnotations": "1.0.2", + "Microsoft.AspNetCore.Mvc.Formatters.Json": "1.0.2", "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 6b25e91c08..858b902225 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.2", "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.2", + "Microsoft.AspNetCore.Mvc.Formatters.Json": "1.0.2", "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 51db9376b2..25ddaacf0d 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.2", "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.2", + "Microsoft.AspNetCore.Mvc.Cors": "1.0.2", + "Microsoft.AspNetCore.Mvc.DataAnnotations": "1.0.2", + "Microsoft.AspNetCore.Mvc.Formatters.Json": "1.0.2", + "Microsoft.AspNetCore.Mvc.Localization": "1.0.2", + "Microsoft.AspNetCore.Mvc.Razor": "1.0.2", + "Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.2", + "Microsoft.AspNetCore.Mvc.ViewFeatures": "1.0.2", "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 0057ebd398..03f05db766 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.2", "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 7db57231cb..13fa0474e6 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.2", + "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.2", "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 438d3daf44..c5a42376ef 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.2", + "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.2", "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 ff9dd6365a..a1e6b0ffca 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.2", + "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.2", "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 fb1c6fb764..b3503f3902 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.2", + "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.2", "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 ff9dd6365a..a1e6b0ffca 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.2", + "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.2", "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 8ce7af101b..9b0f523aea 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.2", + "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.2", "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 f507dc997d..15cc0c7b7a 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.2", + "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.2", "Microsoft.AspNetCore.Mvc.TestCommon": { "version": "1.0.0-*", "type": "build" }, - "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.1", + "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.0", "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 0268a2bd95..7b80a1ff49 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.2", + "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.2", "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 e7d918afe7..a771a2e6f2 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.2", + "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.2", + "Microsoft.AspNetCore.Mvc.Localization": "1.0.2", "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 87fb91f6b1..0741e39a7b 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.2", + "Microsoft.AspNetCore.Mvc.DataAnnotations": "1.0.2", + "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.2", + "Microsoft.AspNetCore.Mvc.Razor": "1.0.2", + "Microsoft.AspNetCore.Mvc.Razor.Host": "1.0.2", "Microsoft.AspNetCore.Mvc.TestCommon": { "version": "1.0.0-*", "type": "build" }, - "Microsoft.AspNetCore.Mvc.ViewFeatures": "1.0.1", + "Microsoft.AspNetCore.Mvc.ViewFeatures": "1.0.2", "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 396ab9c457..35a9b8e2c2 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.2", + "Microsoft.AspNetCore.Mvc.DataAnnotations": "1.0.2", + "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.2", + "Microsoft.AspNetCore.Mvc.Razor": "1.0.2", "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 0740acd075..2b69b65fe8 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.2", + "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.2", + "Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.2", "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 c08cabf8d3..4a79e4e83e 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.2", + "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.2", "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 e856d7e314..1ed6ecc838 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.2", + "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.2", "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 2c850c8961..0758515501 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.2", "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 d82fba85f5..c5598bb19e 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.2", + "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.2", + "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.0", "Microsoft.AspNetCore.StaticFiles": "1.0.0" }, "frameworks": { diff --git a/test/WebSites/ApplicationModelWebSite/project.json b/test/WebSites/ApplicationModelWebSite/project.json index 0a92a2345f..c88cf1e2b9 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.2", + "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.0", "Microsoft.AspNetCore.StaticFiles": "1.0.0" }, "frameworks": { diff --git a/test/WebSites/BasicWebSite/project.json b/test/WebSites/BasicWebSite/project.json index 8f8775fda2..fd8aa4698e 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.2", + "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.2", + "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.0", "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 3a4e4bddff..cc14f575a8 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.2" }, "frameworks": { "net451": {}, diff --git a/test/WebSites/ControllersFromServicesWebSite/project.json b/test/WebSites/ControllersFromServicesWebSite/project.json index ab0f0194fe..f2ca7ad48c 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.2", + "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.0", "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 0766b75e52..15d8026a77 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.2", + "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.2", + "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.0", "Microsoft.AspNetCore.StaticFiles": "1.0.0" }, "frameworks": { diff --git a/test/WebSites/ErrorPageMiddlewareWebSite/project.json b/test/WebSites/ErrorPageMiddlewareWebSite/project.json index 1ab48e23aa..87a9518dfa 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.2", + "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.0", "Microsoft.AspNetCore.StaticFiles": "1.0.0" }, "frameworks": { diff --git a/test/WebSites/FilesWebSite/project.json b/test/WebSites/FilesWebSite/project.json index 91daa1f2d7..30bfeee31d 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.2", + "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.0", "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 3c006aca2d..3803cae6a3 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.2", + "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.2", + "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.0", "Microsoft.AspNetCore.StaticFiles": "1.0.0" }, "frameworks": { diff --git a/test/WebSites/FormatterWebSite/project.json b/test/WebSites/FormatterWebSite/project.json index d82fba85f5..c5598bb19e 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.2", + "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.2", + "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.0", "Microsoft.AspNetCore.StaticFiles": "1.0.0" }, "frameworks": { diff --git a/test/WebSites/HtmlGenerationWebSite/project.json b/test/WebSites/HtmlGenerationWebSite/project.json index 432bd6c0d4..ede4773ffa 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.2", + "Microsoft.AspNetCore.Mvc.TagHelpers": "1.0.2", "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.0" }, "frameworks": { "net451": {}, diff --git a/test/WebSites/Microsoft.AspNetCore.Mvc.TestConfiguration/project.json b/test/WebSites/Microsoft.AspNetCore.Mvc.TestConfiguration/project.json index b30a0a238a..aedf9fdac4 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.0", "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 23cf58b11d..6a53195d3c 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.2", + "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.0", "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 3d141ba489..e061c5b891 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.2", + "Microsoft.AspNetCore.Mvc.Localization": "1.0.2", + "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.0", "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 15b7aff431..95889ef98d 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.2", + "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.0", "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/SecurityWebSite/project.json b/test/WebSites/SecurityWebSite/project.json index a1bfa558d5..2965437c90 100644 --- a/test/WebSites/SecurityWebSite/project.json +++ b/test/WebSites/SecurityWebSite/project.json @@ -4,26 +4,16 @@ "preserveCompilationContext": true }, "dependencies": { - "Microsoft.Extensions.Logging.Debug": "1.1.0-*", - "Microsoft.Extensions.Logging.Console": "1.1.0-*", - "Microsoft.Extensions.Configuration.Json": "1.1.0-*", - "Microsoft.Extensions.Configuration.FileExtensions": "1.1.0-*", - "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.0-*", - "Microsoft.Extensions.Configuration": "1.1.0-*", - "Microsoft.AspNetCore.StaticFiles": "1.1.0-*", - "Microsoft.AspNetCore.Server.Kestrel": "1.1.0-*", - "Microsoft.AspNetCore.Mvc": "1.1.0-*", - "Microsoft.AspNetCore.Mvc.ViewFeatures": "1.1.0-*", - "Microsoft.AspNetCore.Identity.EntityFrameworkCore": "1.1.0-*", - "Microsoft.AspNetCore.Identity": "1.1.0-*", - "Microsoft.AspNetCore.Hosting": "1.1.0-*", - "Microsoft.AspNetCore.Diagnostics": "1.1.0-*" + "Microsoft.AspNetCore.Authentication.Cookies":"1.0.0", + "Microsoft.AspNetCore.Server.Kestrel": "1.0.0", + "Microsoft.AspNetCore.Mvc": "1.0.2", + "Microsoft.AspNetCore.Hosting": "1.0.0" }, "frameworks": { - "netcoreapp1.1": { + "netcoreapp1.0": { "dependencies": { "Microsoft.NETCore.App": { - "version": "1.1.0-*", + "version": "1.0.0", "type": "platform" } }, @@ -39,10 +29,12 @@ ] }, "scripts": { - "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ] + "postpublish": [ + "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" + ] }, "tools": { "Microsoft.AspNetCore.Razor.Tools": "1.0.0-preview2-final", "Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-preview2-final" } -} +} \ No newline at end of file diff --git a/test/WebSites/SimpleWebSite/project.json b/test/WebSites/SimpleWebSite/project.json index 07333befb1..3318a27b01 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.2", "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 c79dcd9ceb..9f21dc84e2 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.2", + "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.0", "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 15b7aff431..95889ef98d 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.2", + "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.0", "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 97182bdcdb..017b649cfd 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.2", + "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.0", + "Microsoft.AspNetCore.Mvc.WebApiCompatShim": "1.0.2", "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 3f50ad6757..0ed504b2a4 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.2", + "Microsoft.AspNetCore.Mvc.Formatters.Xml": "1.0.2", + "Microsoft.AspNetCore.Mvc.TestConfiguration": "1.0.0", "Microsoft.AspNetCore.Server.IISIntegration": "1.0.0", "Microsoft.AspNetCore.Server.Kestrel": "1.0.0", "Microsoft.AspNetCore.StaticFiles": "1.0.0" From 6a9a753ca4f0d5b7cfcd939aee58720e29f700ef Mon Sep 17 00:00:00 2001 From: Pranav K Date: Thu, 3 Nov 2016 10:37:32 -0700 Subject: [PATCH 4/4] Remove extra references from Startup --- test/WebSites/SecurityWebSite/Startup.cs | 25 +----------------------- 1 file changed, 1 insertion(+), 24 deletions(-) diff --git a/test/WebSites/SecurityWebSite/Startup.cs b/test/WebSites/SecurityWebSite/Startup.cs index fe7fa7b9f2..a15ad831f0 100644 --- a/test/WebSites/SecurityWebSite/Startup.cs +++ b/test/WebSites/SecurityWebSite/Startup.cs @@ -3,26 +3,12 @@ using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; namespace SecurityWebSite { public class Startup { - public Startup(IHostingEnvironment env) - { - var builder = new ConfigurationBuilder() - .SetBasePath(env.ContentRootPath) - .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true) - .AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true) - .AddEnvironmentVariables(); - Configuration = builder.Build(); - } - - public IConfigurationRoot Configuration { get; } - // This method gets called by the runtime. Use this method to add services to the container. public void ConfigureServices(IServiceCollection services) { @@ -33,17 +19,8 @@ namespace SecurityWebSite } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. - public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory) + public void Configure(IApplicationBuilder app, IHostingEnvironment env) { - loggerFactory.AddConsole(Configuration.GetSection("Logging")); - loggerFactory.AddDebug(); - - if (env.IsDevelopment()) - { - app.UseDeveloperExceptionPage(); - } - - app.UseStaticFiles(); app.UseCookieAuthentication(new CookieAuthenticationOptions { LoginPath = "/Home/Login",