diff --git a/Mvc.sln b/Mvc.sln index 63f283dac8..82092028de 100644 --- a/Mvc.sln +++ b/Mvc.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.22213.0 +VisualStudioVersion = 14.0.22410.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{DAAE4C74-D06F-4874-A166-33305D2643CE}" EndProject @@ -49,14 +49,10 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "RoutingWebSite", "test\WebS EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Mvc.Test", "test\Microsoft.AspNet.Mvc.Test\Microsoft.AspNet.Mvc.Test.kproj", "{5F945B82-FE5F-425C-956C-8BC2F2020254}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "CompositeViewEngine", "test\WebSites\CompositeViewEngine\CompositeViewEngine.kproj", "{A853B2BA-4449-4908-A416-5A3C027FC22B}" -EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "RazorWebSite", "test\WebSites\RazorWebSite\RazorWebSite.kproj", "{B07CAF59-11ED-40E3-A5DB-E1178F84FA78}" EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "FormatterWebSite", "test\WebSites\FormatterWebSite\FormatterWebSite.kproj", "{62735776-46FF-4170-9392-02E128A69B89}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ValueProvidersSite", "test\WebSites\ValueProvidersSite\ValueProvidersSite.kproj", "{14F79E79-AE79-48FA-95DE-D794EF4EABB3}" -EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Mvc.HeaderValueAbstractions", "src\Microsoft.AspNet.Mvc.HeaderValueAbstractions\Microsoft.AspNet.Mvc.HeaderValueAbstractions.kproj", "{98335B23-E4B9-4CAD-9749-0DED32A659A1}" EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Mvc.HeaderValueAbstractions.Tests", "test\Microsoft.AspNet.Mvc.HeaderValueAbstractions.Test\Microsoft.AspNet.Mvc.HeaderValueAbstractions.Tests.kproj", "{E69FD235-2042-43A4-9970-59CB29955B4E}" @@ -110,6 +106,10 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "PrecompilationWebSite", "te EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "RequestServicesWebSite", "test\WebSites\RequestServicesWebSite\RequestServicesWebSite.kproj", "{F12E9CF0-4958-40C6-A6CD-759185157F84}" EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "CompositeViewEngineWebSite", "test\WebSites\CompositeViewEngineWebSite\CompositeViewEngineWebSite.kproj", "{A853B2BA-4449-4908-A416-5A3C027FC22B}" +EndProject +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "ValueProvidersWebSite", "test\WebSites\ValueProvidersWebSite\ValueProvidersWebSite.kproj", "{14F79E79-AE79-48FA-95DE-D794EF4EABB3}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -310,16 +310,6 @@ Global {5F945B82-FE5F-425C-956C-8BC2F2020254}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {5F945B82-FE5F-425C-956C-8BC2F2020254}.Release|Mixed Platforms.Build.0 = Release|Any CPU {5F945B82-FE5F-425C-956C-8BC2F2020254}.Release|x86.ActiveCfg = Release|Any CPU - {A853B2BA-4449-4908-A416-5A3C027FC22B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A853B2BA-4449-4908-A416-5A3C027FC22B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A853B2BA-4449-4908-A416-5A3C027FC22B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {A853B2BA-4449-4908-A416-5A3C027FC22B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {A853B2BA-4449-4908-A416-5A3C027FC22B}.Debug|x86.ActiveCfg = Debug|Any CPU - {A853B2BA-4449-4908-A416-5A3C027FC22B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A853B2BA-4449-4908-A416-5A3C027FC22B}.Release|Any CPU.Build.0 = Release|Any CPU - {A853B2BA-4449-4908-A416-5A3C027FC22B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {A853B2BA-4449-4908-A416-5A3C027FC22B}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {A853B2BA-4449-4908-A416-5A3C027FC22B}.Release|x86.ActiveCfg = Release|Any CPU {B07CAF59-11ED-40E3-A5DB-E1178F84FA78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B07CAF59-11ED-40E3-A5DB-E1178F84FA78}.Debug|Any CPU.Build.0 = Debug|Any CPU {B07CAF59-11ED-40E3-A5DB-E1178F84FA78}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU @@ -340,16 +330,6 @@ Global {62735776-46FF-4170-9392-02E128A69B89}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {62735776-46FF-4170-9392-02E128A69B89}.Release|Mixed Platforms.Build.0 = Release|Any CPU {62735776-46FF-4170-9392-02E128A69B89}.Release|x86.ActiveCfg = Release|Any CPU - {14F79E79-AE79-48FA-95DE-D794EF4EABB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {14F79E79-AE79-48FA-95DE-D794EF4EABB3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {14F79E79-AE79-48FA-95DE-D794EF4EABB3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {14F79E79-AE79-48FA-95DE-D794EF4EABB3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {14F79E79-AE79-48FA-95DE-D794EF4EABB3}.Debug|x86.ActiveCfg = Debug|Any CPU - {14F79E79-AE79-48FA-95DE-D794EF4EABB3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {14F79E79-AE79-48FA-95DE-D794EF4EABB3}.Release|Any CPU.Build.0 = Release|Any CPU - {14F79E79-AE79-48FA-95DE-D794EF4EABB3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {14F79E79-AE79-48FA-95DE-D794EF4EABB3}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {14F79E79-AE79-48FA-95DE-D794EF4EABB3}.Release|x86.ActiveCfg = Release|Any CPU {98335B23-E4B9-4CAD-9749-0DED32A659A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {98335B23-E4B9-4CAD-9749-0DED32A659A1}.Debug|Any CPU.Build.0 = Debug|Any CPU {98335B23-E4B9-4CAD-9749-0DED32A659A1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU @@ -590,6 +570,30 @@ Global {F12E9CF0-4958-40C6-A6CD-759185157F84}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU {F12E9CF0-4958-40C6-A6CD-759185157F84}.Release|Mixed Platforms.Build.0 = Release|Any CPU {F12E9CF0-4958-40C6-A6CD-759185157F84}.Release|x86.ActiveCfg = Release|Any CPU + {A853B2BA-4449-4908-A416-5A3C027FC22B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A853B2BA-4449-4908-A416-5A3C027FC22B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A853B2BA-4449-4908-A416-5A3C027FC22B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {A853B2BA-4449-4908-A416-5A3C027FC22B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {A853B2BA-4449-4908-A416-5A3C027FC22B}.Debug|x86.ActiveCfg = Debug|Any CPU + {A853B2BA-4449-4908-A416-5A3C027FC22B}.Debug|x86.Build.0 = Debug|Any CPU + {A853B2BA-4449-4908-A416-5A3C027FC22B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A853B2BA-4449-4908-A416-5A3C027FC22B}.Release|Any CPU.Build.0 = Release|Any CPU + {A853B2BA-4449-4908-A416-5A3C027FC22B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {A853B2BA-4449-4908-A416-5A3C027FC22B}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {A853B2BA-4449-4908-A416-5A3C027FC22B}.Release|x86.ActiveCfg = Release|Any CPU + {A853B2BA-4449-4908-A416-5A3C027FC22B}.Release|x86.Build.0 = Release|Any CPU + {14F79E79-AE79-48FA-95DE-D794EF4EABB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {14F79E79-AE79-48FA-95DE-D794EF4EABB3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {14F79E79-AE79-48FA-95DE-D794EF4EABB3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {14F79E79-AE79-48FA-95DE-D794EF4EABB3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {14F79E79-AE79-48FA-95DE-D794EF4EABB3}.Debug|x86.ActiveCfg = Debug|Any CPU + {14F79E79-AE79-48FA-95DE-D794EF4EABB3}.Debug|x86.Build.0 = Debug|Any CPU + {14F79E79-AE79-48FA-95DE-D794EF4EABB3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {14F79E79-AE79-48FA-95DE-D794EF4EABB3}.Release|Any CPU.Build.0 = Release|Any CPU + {14F79E79-AE79-48FA-95DE-D794EF4EABB3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {14F79E79-AE79-48FA-95DE-D794EF4EABB3}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {14F79E79-AE79-48FA-95DE-D794EF4EABB3}.Release|x86.ActiveCfg = Release|Any CPU + {14F79E79-AE79-48FA-95DE-D794EF4EABB3}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -615,10 +619,8 @@ Global {680D75ED-601F-4D86-B01B-1072D0C31B8C} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C} {42CDBF4A-E238-4C0F-A416-44588363EB4C} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C} {5F945B82-FE5F-425C-956C-8BC2F2020254} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} - {A853B2BA-4449-4908-A416-5A3C027FC22B} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C} {B07CAF59-11ED-40E3-A5DB-E1178F84FA78} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C} {62735776-46FF-4170-9392-02E128A69B89} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C} - {14F79E79-AE79-48FA-95DE-D794EF4EABB3} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C} {98335B23-E4B9-4CAD-9749-0DED32A659A1} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E} {E69FD235-2042-43A4-9970-59CB29955B4E} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} {EE1AB716-F102-4CA3-AD2C-214A44B459A0} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C} @@ -643,5 +645,7 @@ Global {860119ED-3DB1-424D-8D0A-30132A8A7D96} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} {59E1BE90-92C1-4D35-ADCC-B69F49077C81} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C} {F12E9CF0-4958-40C6-A6CD-759185157F84} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C} + {A853B2BA-4449-4908-A416-5A3C027FC22B} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C} + {14F79E79-AE79-48FA-95DE-D794EF4EABB3} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C} EndGlobalSection EndGlobal diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/ApiExplorerTest.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/ApiExplorerTest.cs index b167f31292..fb8ed2050f 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/ApiExplorerTest.cs +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/ApiExplorerTest.cs @@ -15,7 +15,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests public class ApiExplorerTest { private readonly IServiceProvider _provider = TestHelper.CreateServices("ApiExplorerWebSite"); - private readonly Action _app = new ApiExplorer.Startup().Configure; + private readonly Action _app = new ApiExplorerWebSite.Startup().Configure; [Fact] public async Task ApiExplorer_IsVisible_EnabledWithConvention() @@ -498,9 +498,9 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests } [Theory] - [InlineData("GetProduct", "ApiExplorer.Product")] + [InlineData("GetProduct", "ApiExplorerWebSite.Product")] [InlineData("GetInt", "System.Int32")] - [InlineData("GetTaskOfProduct", "ApiExplorer.Product")] + [InlineData("GetTaskOfProduct", "ApiExplorerWebSite.Product")] [InlineData("GetTaskOfInt", "System.Int32")] public async Task ApiExplorer_ResponseType_KnownWithoutAttribute(string action, string type) { @@ -521,10 +521,10 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests } [Theory] - [InlineData("GetVoid", "ApiExplorer.Customer")] - [InlineData("GetObject", "ApiExplorer.Product")] + [InlineData("GetVoid", "ApiExplorerWebSite.Customer")] + [InlineData("GetObject", "ApiExplorerWebSite.Product")] [InlineData("GetIActionResult", "System.String")] - [InlineData("GetProduct", "ApiExplorer.Customer")] + [InlineData("GetProduct", "ApiExplorerWebSite.Customer")] [InlineData("GetTask", "System.Int32")] public async Task ApiExplorer_ResponseType_KnownWithAttribute(string action, string type) { @@ -545,8 +545,8 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests } [Theory] - [InlineData("Controller", "ApiExplorer.Product")] - [InlineData("Action", "ApiExplorer.Customer")] + [InlineData("Controller", "ApiExplorerWebSite.Product")] + [InlineData("Action", "ApiExplorerWebSite.Customer")] public async Task ApiExplorer_ResponseType_OverrideOnAction(string action, string type) { // Arrange diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/CompositeViewEngineTests.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/CompositeViewEngineTests.cs index 49ff7545cd..82cd75a224 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/CompositeViewEngineTests.cs +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/CompositeViewEngineTests.cs @@ -11,8 +11,8 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests { public class CompositeViewEngineTests { - private readonly IServiceProvider _services = TestHelper.CreateServices("CompositeViewEngine"); - private readonly Action _app = new CompositeViewEngine.Startup().Configure; + private readonly IServiceProvider _services = TestHelper.CreateServices(nameof(CompositeViewEngineWebSite)); + private readonly Action _app = new CompositeViewEngineWebSite.Startup().Configure; [Fact] public async Task CompositeViewEngine_FindsPartialViewsAcrossAllEngines() diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/ConnegTests.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/ConnegTests.cs index ca20a57065..0d023c8a02 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/ConnegTests.cs +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/ConnegTests.cs @@ -7,7 +7,7 @@ using System.Net.Http; using System.Net.Http.Headers; using System.Text; using System.Threading.Tasks; -using ConnegWebsite; +using ConnegWebSite; using Microsoft.AspNet.Builder; using Microsoft.AspNet.TestHost; using Xunit; @@ -16,7 +16,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests { public class ConnegTests { - private readonly IServiceProvider _provider = TestHelper.CreateServices("ConnegWebSite"); + private readonly IServiceProvider _provider = TestHelper.CreateServices(nameof(ConnegWebSite)); private readonly Action _app = new Startup().Configure; [Fact] diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/OutputFormatterTest.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/OutputFormatterTest.cs index 5b73b0a87c..6161e3e626 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/OutputFormatterTest.cs +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/OutputFormatterTest.cs @@ -5,7 +5,7 @@ using System; using System.Net; using System.Net.Http.Headers; using System.Threading.Tasks; -using ConnegWebsite; +using ConnegWebSite; using Microsoft.AspNet.Builder; using Microsoft.AspNet.TestHost; using Xunit; @@ -14,7 +14,7 @@ namespace Microsoft.AspNet.Mvc.FunctionalTests { public class OutputFormatterTest { - private readonly IServiceProvider _provider = TestHelper.CreateServices("ConnegWebSite"); + private readonly IServiceProvider _provider = TestHelper.CreateServices(nameof(ConnegWebSite)); private readonly Action _app = new Startup().Configure; [Theory] diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/ValueProviderTest.cs b/test/Microsoft.AspNet.Mvc.FunctionalTests/ValueProviderTest.cs index 75b317d3cf..166d49e4ed 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/ValueProviderTest.cs +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/ValueProviderTest.cs @@ -5,14 +5,14 @@ using System; using System.Threading.Tasks; using Microsoft.AspNet.Builder; using Microsoft.AspNet.TestHost; -using ValueProvidersSite; +using ValueProvidersWebSite; using Xunit; namespace Microsoft.AspNet.Mvc.FunctionalTests { public class ValueProviderTest { - private readonly IServiceProvider _services = TestHelper.CreateServices("ValueProvidersSite"); + private readonly IServiceProvider _services = TestHelper.CreateServices(nameof(ValueProvidersWebSite)); private readonly Action _app = new Startup().Configure; [Fact] diff --git a/test/Microsoft.AspNet.Mvc.FunctionalTests/project.json b/test/Microsoft.AspNet.Mvc.FunctionalTests/project.json index d7faa63abc..6f3b83e729 100644 --- a/test/Microsoft.AspNet.Mvc.FunctionalTests/project.json +++ b/test/Microsoft.AspNet.Mvc.FunctionalTests/project.json @@ -9,7 +9,7 @@ "ApiExplorerWebSite": "1.0.0", "ApplicationModelWebSite": "1.0.0", "BasicWebSite": "1.0.0", - "CompositeViewEngine": "1.0.0", + "CompositeViewEngineWebSite": "1.0.0", "ConnegWebSite": "1.0.0", "FilesWebSite": "1.0.0", "FiltersWebSite": "1.0.0", @@ -25,7 +25,7 @@ "TagHelperSample.Web": "1.0.0", "TagHelpersWebSite": "1.0.0", "UrlHelperWebSite": "1.0.0", - "ValueProvidersSite": "1.0.0", + "ValueProvidersWebSite": "1.0.0", "VersioningWebSite": "1.0.0", "ViewComponentWebSite": "1.0.0", "XmlSerializerWebSite": "1.0.0", diff --git a/test/WebSites/ApiExplorerWebSite/ApiExplorerDataFilter.cs b/test/WebSites/ApiExplorerWebSite/ApiExplorerDataFilter.cs index bab7c29a59..a0e2001fed 100644 --- a/test/WebSites/ApiExplorerWebSite/ApiExplorerDataFilter.cs +++ b/test/WebSites/ApiExplorerWebSite/ApiExplorerDataFilter.cs @@ -6,7 +6,7 @@ using System.Linq; using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Mvc.Description; -namespace ApiExplorer +namespace ApiExplorerWebSite { /// /// An action filter that looks up and serializes Api Explorer data for the action. diff --git a/test/WebSites/ApiExplorerWebSite/ApiExplorerVisibilityDisabledConvention.cs b/test/WebSites/ApiExplorerWebSite/ApiExplorerVisibilityDisabledConvention.cs index 2b1daf27b4..5840722d8d 100644 --- a/test/WebSites/ApiExplorerWebSite/ApiExplorerVisibilityDisabledConvention.cs +++ b/test/WebSites/ApiExplorerWebSite/ApiExplorerVisibilityDisabledConvention.cs @@ -5,7 +5,7 @@ using System; using System.Reflection; using Microsoft.AspNet.Mvc.ApplicationModels; -namespace ApiExplorer +namespace ApiExplorerWebSite { // Disables ApiExplorer for a specific controller type. // This is part of the test that validates that ApiExplorer can be configured via diff --git a/test/WebSites/ApiExplorerWebSite/ApiExplorerVisibilityEnabledConvention.cs b/test/WebSites/ApiExplorerWebSite/ApiExplorerVisibilityEnabledConvention.cs index 664dd95d72..7e06902d8f 100644 --- a/test/WebSites/ApiExplorerWebSite/ApiExplorerVisibilityEnabledConvention.cs +++ b/test/WebSites/ApiExplorerWebSite/ApiExplorerVisibilityEnabledConvention.cs @@ -3,7 +3,7 @@ using Microsoft.AspNet.Mvc.ApplicationModels; -namespace ApiExplorer +namespace ApiExplorerWebSite { // Enables ApiExplorer for controllers that haven't explicitly configured it. // This is part of the test that validates that ApiExplorer can be configured via diff --git a/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerHttpMethodController.cs b/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerHttpMethodController.cs index 6c64202261..3c86642bf4 100644 --- a/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerHttpMethodController.cs +++ b/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerHttpMethodController.cs @@ -3,7 +3,7 @@ using Microsoft.AspNet.Mvc; -namespace ApiExplorer +namespace ApiExplorerWebSite { [Route("ApiExplorerHttpMethod")] public class ApiExplorerHttpMethodController : Controller diff --git a/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerNameSetByConventionController.cs b/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerNameSetByConventionController.cs index d5aeda810a..6f2a8d760d 100644 --- a/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerNameSetByConventionController.cs +++ b/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerNameSetByConventionController.cs @@ -3,7 +3,7 @@ using Microsoft.AspNet.Mvc; -namespace ApiExplorer +namespace ApiExplorerWebSite { [Route("ApiExplorerNameSetByConvention")] public class ApiExplorerNameSetByConventionController : Controller diff --git a/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerNameSetExplicitlyController.cs b/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerNameSetExplicitlyController.cs index a6e49ad5d9..db923f4977 100644 --- a/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerNameSetExplicitlyController.cs +++ b/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerNameSetExplicitlyController.cs @@ -3,7 +3,7 @@ using Microsoft.AspNet.Mvc; -namespace ApiExplorer +namespace ApiExplorerWebSite { [ApiExplorerSettings(GroupName = "SetOnController")] [Route("ApiExplorerNameSetExplicitly")] diff --git a/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseContentTypeController.cs b/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseContentTypeController.cs index b1d6771c30..25b22422f5 100644 --- a/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseContentTypeController.cs +++ b/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseContentTypeController.cs @@ -3,7 +3,7 @@ using Microsoft.AspNet.Mvc; -namespace ApiExplorer +namespace ApiExplorerWebSite { [Route("ApiExplorerResponseContentType/[Action]")] public class ApiExplorerResponseContentTypeController : Controller diff --git a/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseContentTypeOverrideOnActionController.cs b/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseContentTypeOverrideOnActionController.cs index 6e6bd35728..3ed9483fed 100644 --- a/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseContentTypeOverrideOnActionController.cs +++ b/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseContentTypeOverrideOnActionController.cs @@ -3,7 +3,7 @@ using Microsoft.AspNet.Mvc; -namespace ApiExplorer +namespace ApiExplorerWebSite { [Produces("text/xml")] [Route("ApiExplorerResponseContentTypeOverrideOnAction")] diff --git a/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseTypeOverrideOnActionController.cs b/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseTypeOverrideOnActionController.cs index 3b7c178cfe..f457dfcf56 100644 --- a/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseTypeOverrideOnActionController.cs +++ b/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseTypeOverrideOnActionController.cs @@ -3,7 +3,7 @@ using Microsoft.AspNet.Mvc; -namespace ApiExplorer +namespace ApiExplorerWebSite { [Produces("*/*", Type = typeof(Product))] [Route("ApiExplorerResponseTypeOverrideOnAction")] diff --git a/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseTypeWithAttributeController.cs b/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseTypeWithAttributeController.cs index 59589cb578..29c9cd7a2f 100644 --- a/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseTypeWithAttributeController.cs +++ b/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseTypeWithAttributeController.cs @@ -4,7 +4,7 @@ using System.Threading.Tasks; using Microsoft.AspNet.Mvc; -namespace ApiExplorer +namespace ApiExplorerWebSite { [Route("ApiExplorerResponseTypeWithAttribute/[Action]")] public class ApiExplorerResponseTypeWithAttributeController : Controller diff --git a/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseTypeWithoutAttributeController.cs b/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseTypeWithoutAttributeController.cs index 4bbd53da60..813acf4d4e 100644 --- a/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseTypeWithoutAttributeController.cs +++ b/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerResponseTypeWithoutAttributeController.cs @@ -4,7 +4,7 @@ using System.Threading.Tasks; using Microsoft.AspNet.Mvc; -namespace ApiExplorer +namespace ApiExplorerWebSite { [Route("ApiExplorerResponseTypeWithoutAttribute/[Action]")] public class ApiExplorerResponseTypeWithoutAttributeController : Controller diff --git a/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerRouteAndPathParametersInformationController.cs b/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerRouteAndPathParametersInformationController.cs index 16036e0b65..798bd7937f 100644 --- a/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerRouteAndPathParametersInformationController.cs +++ b/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerRouteAndPathParametersInformationController.cs @@ -3,7 +3,7 @@ using Microsoft.AspNet.Mvc; -namespace ApiExplorer +namespace ApiExplorerWebSite { [Route("ApiExplorerRouteAndPathParametersInformation")] public class ApiExplorerRouteAndPathParametersInformationController diff --git a/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerVisibilityDisabledByConventionController.cs b/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerVisibilityDisabledByConventionController.cs index 43c677b106..7a535ae18f 100644 --- a/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerVisibilityDisabledByConventionController.cs +++ b/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerVisibilityDisabledByConventionController.cs @@ -3,7 +3,7 @@ using Microsoft.AspNet.Mvc; -namespace ApiExplorer +namespace ApiExplorerWebSite { [Route("ApiExplorerVisbilityDisabledByConvention")] public class ApiExplorerVisbilityDisabledByConventionController : Controller diff --git a/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerVisibilityEnabledByConventionController.cs b/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerVisibilityEnabledByConventionController.cs index bf9c9f695f..acd0c62ae8 100644 --- a/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerVisibilityEnabledByConventionController.cs +++ b/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerVisibilityEnabledByConventionController.cs @@ -3,7 +3,7 @@ using Microsoft.AspNet.Mvc; -namespace ApiExplorer +namespace ApiExplorerWebSite { [Route("ApiExplorerVisbilityEnabledByConvention")] public class ApiExplorerVisbilityEnabledByConventionController : Controller diff --git a/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerVisibilitySetExplicitlyController.cs b/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerVisibilitySetExplicitlyController.cs index bf6d6b9b8c..d6503cd940 100644 --- a/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerVisibilitySetExplicitlyController.cs +++ b/test/WebSites/ApiExplorerWebSite/Controllers/ApiExplorerVisibilitySetExplicitlyController.cs @@ -3,7 +3,7 @@ using Microsoft.AspNet.Mvc; -namespace ApiExplorer +namespace ApiExplorerWebSite { [ApiExplorerSettings(IgnoreApi = true)] [Route("ApiExplorerVisibilitySetExplicitly")] diff --git a/test/WebSites/ApiExplorerWebSite/Models/Customer.cs b/test/WebSites/ApiExplorerWebSite/Models/Customer.cs index 161b1d8039..07d993ba01 100644 --- a/test/WebSites/ApiExplorerWebSite/Models/Customer.cs +++ b/test/WebSites/ApiExplorerWebSite/Models/Customer.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -namespace ApiExplorer +namespace ApiExplorerWebSite { public class Customer { diff --git a/test/WebSites/ApiExplorerWebSite/Models/Product.cs b/test/WebSites/ApiExplorerWebSite/Models/Product.cs index af1d536275..2d608bedd2 100644 --- a/test/WebSites/ApiExplorerWebSite/Models/Product.cs +++ b/test/WebSites/ApiExplorerWebSite/Models/Product.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -namespace ApiExplorer +namespace ApiExplorerWebSite { public class Product { diff --git a/test/WebSites/ApiExplorerWebSite/ProducesTypeAttribute.cs b/test/WebSites/ApiExplorerWebSite/ProducesTypeAttribute.cs index fea0b4f31c..f9150e603d 100644 --- a/test/WebSites/ApiExplorerWebSite/ProducesTypeAttribute.cs +++ b/test/WebSites/ApiExplorerWebSite/ProducesTypeAttribute.cs @@ -7,7 +7,7 @@ using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Mvc.Description; using Microsoft.AspNet.Mvc.HeaderValueAbstractions; -namespace ApiExplorer +namespace ApiExplorerWebSite { public class ProducesTypeAttribute : ResultFilterAttribute, IApiResponseMetadataProvider { diff --git a/test/WebSites/ApiExplorerWebSite/Startup.cs b/test/WebSites/ApiExplorerWebSite/Startup.cs index 33db37168a..34b77d4717 100644 --- a/test/WebSites/ApiExplorerWebSite/Startup.cs +++ b/test/WebSites/ApiExplorerWebSite/Startup.cs @@ -6,7 +6,7 @@ using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Routing; using Microsoft.Framework.DependencyInjection; -namespace ApiExplorer +namespace ApiExplorerWebSite { public class Startup { diff --git a/test/WebSites/CompositeViewEngine/CompositeViewEngine.kproj b/test/WebSites/CompositeViewEngineWebSite/CompositeViewEngineWebSite.kproj similarity index 100% rename from test/WebSites/CompositeViewEngine/CompositeViewEngine.kproj rename to test/WebSites/CompositeViewEngineWebSite/CompositeViewEngineWebSite.kproj diff --git a/test/WebSites/CompositeViewEngine/HomeController.cs b/test/WebSites/CompositeViewEngineWebSite/HomeController.cs similarity index 92% rename from test/WebSites/CompositeViewEngine/HomeController.cs rename to test/WebSites/CompositeViewEngineWebSite/HomeController.cs index d79da054db..f743352136 100644 --- a/test/WebSites/CompositeViewEngine/HomeController.cs +++ b/test/WebSites/CompositeViewEngineWebSite/HomeController.cs @@ -3,7 +3,7 @@ using Microsoft.AspNet.Mvc; -namespace CompositeViewEngine +namespace CompositeViewEngineWebSite { public class HomeController { diff --git a/test/WebSites/CompositeViewEngine/Startup.cs b/test/WebSites/CompositeViewEngineWebSite/Startup.cs similarity index 96% rename from test/WebSites/CompositeViewEngine/Startup.cs rename to test/WebSites/CompositeViewEngineWebSite/Startup.cs index 389a6b3082..8dec22ad38 100644 --- a/test/WebSites/CompositeViewEngine/Startup.cs +++ b/test/WebSites/CompositeViewEngineWebSite/Startup.cs @@ -5,7 +5,7 @@ using Microsoft.AspNet.Builder; using Microsoft.AspNet.Mvc; using Microsoft.Framework.DependencyInjection; -namespace CompositeViewEngine +namespace CompositeViewEngineWebSite { public class Startup { diff --git a/test/WebSites/CompositeViewEngine/TestPartialView.cs b/test/WebSites/CompositeViewEngineWebSite/TestPartialView.cs similarity index 92% rename from test/WebSites/CompositeViewEngine/TestPartialView.cs rename to test/WebSites/CompositeViewEngineWebSite/TestPartialView.cs index 2a82cc966e..264fec5e09 100644 --- a/test/WebSites/CompositeViewEngine/TestPartialView.cs +++ b/test/WebSites/CompositeViewEngineWebSite/TestPartialView.cs @@ -5,7 +5,7 @@ using System.Threading.Tasks; using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Mvc.Rendering; -namespace CompositeViewEngine +namespace CompositeViewEngineWebSite { public class TestPartialView : IView { diff --git a/test/WebSites/CompositeViewEngine/TestView.cs b/test/WebSites/CompositeViewEngineWebSite/TestView.cs similarity index 92% rename from test/WebSites/CompositeViewEngine/TestView.cs rename to test/WebSites/CompositeViewEngineWebSite/TestView.cs index 6a191a299f..907c37aaf2 100644 --- a/test/WebSites/CompositeViewEngine/TestView.cs +++ b/test/WebSites/CompositeViewEngineWebSite/TestView.cs @@ -5,7 +5,7 @@ using System.Threading.Tasks; using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Mvc.Rendering; -namespace CompositeViewEngine +namespace CompositeViewEngineWebSite { public class TestView : IView { diff --git a/test/WebSites/CompositeViewEngine/TestViewEngine.cs b/test/WebSites/CompositeViewEngineWebSite/TestViewEngine.cs similarity index 96% rename from test/WebSites/CompositeViewEngine/TestViewEngine.cs rename to test/WebSites/CompositeViewEngineWebSite/TestViewEngine.cs index 7b59d40b0a..6e33536211 100644 --- a/test/WebSites/CompositeViewEngine/TestViewEngine.cs +++ b/test/WebSites/CompositeViewEngineWebSite/TestViewEngine.cs @@ -5,7 +5,7 @@ using System; using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Mvc.Rendering; -namespace CompositeViewEngine +namespace CompositeViewEngineWebSite { public class TestViewEngine : IViewEngine { diff --git a/test/WebSites/CompositeViewEngine/Views/Home/Index.cshtml b/test/WebSites/CompositeViewEngineWebSite/Views/Home/Index.cshtml similarity index 100% rename from test/WebSites/CompositeViewEngine/Views/Home/Index.cshtml rename to test/WebSites/CompositeViewEngineWebSite/Views/Home/Index.cshtml diff --git a/test/WebSites/CompositeViewEngine/project.json b/test/WebSites/CompositeViewEngineWebSite/project.json similarity index 100% rename from test/WebSites/CompositeViewEngine/project.json rename to test/WebSites/CompositeViewEngineWebSite/project.json diff --git a/test/WebSites/CompositeViewEngine/wwwroot/readme.md b/test/WebSites/CompositeViewEngineWebSite/wwwroot/readme.md similarity index 100% rename from test/WebSites/CompositeViewEngine/wwwroot/readme.md rename to test/WebSites/CompositeViewEngineWebSite/wwwroot/readme.md diff --git a/test/WebSites/ConnegWebSite/Controllers/FallbackOnTypeBasedMatchController.cs b/test/WebSites/ConnegWebSite/Controllers/FallbackOnTypeBasedMatchController.cs index d49d693d53..90d724afdd 100644 --- a/test/WebSites/ConnegWebSite/Controllers/FallbackOnTypeBasedMatchController.cs +++ b/test/WebSites/ConnegWebSite/Controllers/FallbackOnTypeBasedMatchController.cs @@ -3,7 +3,7 @@ using Microsoft.AspNet.Mvc; using Microsoft.Framework.DependencyInjection; -namespace ConnegWebsite +namespace ConnegWebSite { public class FallbackOnTypeBasedMatchController : Controller { diff --git a/test/WebSites/ConnegWebSite/Controllers/HomeController.cs b/test/WebSites/ConnegWebSite/Controllers/HomeController.cs index ec92463c3b..56307aa2fe 100644 --- a/test/WebSites/ConnegWebSite/Controllers/HomeController.cs +++ b/test/WebSites/ConnegWebSite/Controllers/HomeController.cs @@ -3,7 +3,7 @@ using Microsoft.AspNet.Mvc; -namespace ConnegWebsite +namespace ConnegWebSite { public class HomeController : Controller { diff --git a/test/WebSites/ConnegWebSite/Controllers/JsonResultController.cs b/test/WebSites/ConnegWebSite/Controllers/JsonResultController.cs index bef9e38a78..370371b382 100644 --- a/test/WebSites/ConnegWebSite/Controllers/JsonResultController.cs +++ b/test/WebSites/ConnegWebSite/Controllers/JsonResultController.cs @@ -4,7 +4,7 @@ using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Mvc.HeaderValueAbstractions; -namespace ConnegWebsite +namespace ConnegWebSite { public class JsonResultController : Controller { diff --git a/test/WebSites/ConnegWebSite/Controllers/NoContentController.cs b/test/WebSites/ConnegWebSite/Controllers/NoContentController.cs index b2019243b8..9cd8902575 100644 --- a/test/WebSites/ConnegWebSite/Controllers/NoContentController.cs +++ b/test/WebSites/ConnegWebSite/Controllers/NoContentController.cs @@ -4,7 +4,7 @@ using System.Threading.Tasks; using Microsoft.AspNet.Mvc; -namespace ConnegWebsite +namespace ConnegWebSite { public class NoContentController : Controller { diff --git a/test/WebSites/ConnegWebSite/Controllers/NoContentDoNotTreatNullValueAsNoContentController.cs b/test/WebSites/ConnegWebSite/Controllers/NoContentDoNotTreatNullValueAsNoContentController.cs index ed7bd468e9..8a16c2d1db 100644 --- a/test/WebSites/ConnegWebSite/Controllers/NoContentDoNotTreatNullValueAsNoContentController.cs +++ b/test/WebSites/ConnegWebSite/Controllers/NoContentDoNotTreatNullValueAsNoContentController.cs @@ -4,7 +4,7 @@ using System.Threading.Tasks; using Microsoft.AspNet.Mvc; -namespace ConnegWebsite +namespace ConnegWebSite { public class NoContentDoNotTreatNullValueAsNoContentController : Controller { diff --git a/test/WebSites/ConnegWebSite/Controllers/NoProducesContentOnClassController.cs b/test/WebSites/ConnegWebSite/Controllers/NoProducesContentOnClassController.cs index 570a63a2b1..a223670a12 100644 --- a/test/WebSites/ConnegWebSite/Controllers/NoProducesContentOnClassController.cs +++ b/test/WebSites/ConnegWebSite/Controllers/NoProducesContentOnClassController.cs @@ -3,7 +3,7 @@ using Microsoft.AspNet.Mvc; -namespace ConnegWebsite +namespace ConnegWebSite { public class NoProducesContentOnClassController : ProducesContentBaseController { diff --git a/test/WebSites/ConnegWebSite/Controllers/NormalController.cs b/test/WebSites/ConnegWebSite/Controllers/NormalController.cs index 0979c844b0..3ac7fb5d14 100644 --- a/test/WebSites/ConnegWebSite/Controllers/NormalController.cs +++ b/test/WebSites/ConnegWebSite/Controllers/NormalController.cs @@ -4,7 +4,7 @@ using Microsoft.AspNet.Mvc; using Newtonsoft.Json; -namespace ConnegWebsite +namespace ConnegWebSite { public class NormalController : Controller { diff --git a/test/WebSites/ConnegWebSite/Controllers/ProducesContentBaseController.cs b/test/WebSites/ConnegWebSite/Controllers/ProducesContentBaseController.cs index 877666026a..2e35e28a32 100644 --- a/test/WebSites/ConnegWebSite/Controllers/ProducesContentBaseController.cs +++ b/test/WebSites/ConnegWebSite/Controllers/ProducesContentBaseController.cs @@ -3,7 +3,7 @@ using Microsoft.AspNet.Mvc; -namespace ConnegWebsite +namespace ConnegWebSite { [Produces("application/custom_ProducesContentBaseController")] public class ProducesContentBaseController : Controller diff --git a/test/WebSites/ConnegWebSite/Controllers/ProducesContentOnClassController.cs b/test/WebSites/ConnegWebSite/Controllers/ProducesContentOnClassController.cs index f899c63d30..9b0acbdd10 100644 --- a/test/WebSites/ConnegWebSite/Controllers/ProducesContentOnClassController.cs +++ b/test/WebSites/ConnegWebSite/Controllers/ProducesContentOnClassController.cs @@ -3,7 +3,7 @@ using Microsoft.AspNet.Mvc; -namespace ConnegWebsite +namespace ConnegWebSite { [Produces("application/custom_ProducesContentOnClassController")] public class ProducesContentOnClassController : ProducesContentBaseController diff --git a/test/WebSites/ConnegWebSite/Controllers/ProducesWithMediaTypeParametersController.cs b/test/WebSites/ConnegWebSite/Controllers/ProducesWithMediaTypeParametersController.cs index e87db2ffa9..8e2da1a87a 100644 --- a/test/WebSites/ConnegWebSite/Controllers/ProducesWithMediaTypeParametersController.cs +++ b/test/WebSites/ConnegWebSite/Controllers/ProducesWithMediaTypeParametersController.cs @@ -1,10 +1,10 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using ConnegWebsite.Models; +using ConnegWebSite.Models; using Microsoft.AspNet.Mvc; -namespace ConnegWebsite +namespace ConnegWebSite { public class ProducesWithMediaTypeParametersController : Controller { diff --git a/test/WebSites/ConnegWebSite/Controllers/TextPlainController.cs b/test/WebSites/ConnegWebSite/Controllers/TextPlainController.cs index 1057cdd4fd..4d94f88b82 100644 --- a/test/WebSites/ConnegWebSite/Controllers/TextPlainController.cs +++ b/test/WebSites/ConnegWebSite/Controllers/TextPlainController.cs @@ -4,7 +4,7 @@ using System.Threading.Tasks; using Microsoft.AspNet.Mvc; -namespace ConnegWebsite +namespace ConnegWebSite { public class TextPlainController : Controller { diff --git a/test/WebSites/ConnegWebSite/CustomFormatter.cs b/test/WebSites/ConnegWebSite/CustomFormatter.cs index b33cb21742..a80666b4b6 100644 --- a/test/WebSites/ConnegWebSite/CustomFormatter.cs +++ b/test/WebSites/ConnegWebSite/CustomFormatter.cs @@ -7,7 +7,7 @@ using Microsoft.AspNet.Http; using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Mvc.HeaderValueAbstractions; -namespace ConnegWebsite +namespace ConnegWebSite { public class CustomFormatter : OutputFormatter { diff --git a/test/WebSites/ConnegWebSite/Models/Contact.cs b/test/WebSites/ConnegWebSite/Models/Contact.cs index 287eb5e444..c2b31f71f0 100644 --- a/test/WebSites/ConnegWebSite/Models/Contact.cs +++ b/test/WebSites/ConnegWebSite/Models/Contact.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft Open Technologies, Inc. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -namespace ConnegWebsite.Models +namespace ConnegWebSite.Models { public class Contact { diff --git a/test/WebSites/ConnegWebSite/Models/User.cs b/test/WebSites/ConnegWebSite/Models/User.cs index cb32ddbcfc..b52467214d 100644 --- a/test/WebSites/ConnegWebSite/Models/User.cs +++ b/test/WebSites/ConnegWebSite/Models/User.cs @@ -3,7 +3,7 @@ using System.ComponentModel.DataAnnotations; -namespace ConnegWebsite +namespace ConnegWebSite { [DisplayColumn("Name")] public class User diff --git a/test/WebSites/ConnegWebSite/PlainTextFormatter.cs b/test/WebSites/ConnegWebSite/PlainTextFormatter.cs index c812bdb979..c8f6bd1520 100644 --- a/test/WebSites/ConnegWebSite/PlainTextFormatter.cs +++ b/test/WebSites/ConnegWebSite/PlainTextFormatter.cs @@ -7,7 +7,7 @@ using Microsoft.AspNet.Http; using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Mvc.HeaderValueAbstractions; -namespace ConnegWebsite +namespace ConnegWebSite { public class PlainTextFormatter : OutputFormatter { diff --git a/test/WebSites/ConnegWebSite/Startup.cs b/test/WebSites/ConnegWebSite/Startup.cs index 939707b984..8901654343 100644 --- a/test/WebSites/ConnegWebSite/Startup.cs +++ b/test/WebSites/ConnegWebSite/Startup.cs @@ -5,7 +5,7 @@ using Microsoft.AspNet.Builder; using Microsoft.AspNet.Routing; using Microsoft.Framework.DependencyInjection; -namespace ConnegWebsite +namespace ConnegWebSite { public class Startup { diff --git a/test/WebSites/ConnegWebSite/VCardFormatter_V3.cs b/test/WebSites/ConnegWebSite/VCardFormatter_V3.cs index fbcb6af7f2..ca7e84710a 100644 --- a/test/WebSites/ConnegWebSite/VCardFormatter_V3.cs +++ b/test/WebSites/ConnegWebSite/VCardFormatter_V3.cs @@ -6,11 +6,11 @@ using System.IO; using System.Reflection; using System.Text; using System.Threading.Tasks; -using ConnegWebsite.Models; +using ConnegWebSite.Models; using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Mvc.HeaderValueAbstractions; -namespace ConnegWebsite +namespace ConnegWebSite { /// /// Provides contact information of a person through VCard format. diff --git a/test/WebSites/ConnegWebSite/VCardFormatter_V4.cs b/test/WebSites/ConnegWebSite/VCardFormatter_V4.cs index a77f02a176..2b6b549afb 100644 --- a/test/WebSites/ConnegWebSite/VCardFormatter_V4.cs +++ b/test/WebSites/ConnegWebSite/VCardFormatter_V4.cs @@ -6,11 +6,11 @@ using System.IO; using System.Reflection; using System.Text; using System.Threading.Tasks; -using ConnegWebsite.Models; +using ConnegWebSite.Models; using Microsoft.AspNet.Mvc; using Microsoft.AspNet.Mvc.HeaderValueAbstractions; -namespace ConnegWebsite +namespace ConnegWebSite { /// /// Provides contact information of a person through VCard format. diff --git a/test/WebSites/ValueProvidersSite/CustomValueProviderFactory.cs b/test/WebSites/ValueProvidersWebSite/CustomValueProviderFactory.cs similarity index 97% rename from test/WebSites/ValueProvidersSite/CustomValueProviderFactory.cs rename to test/WebSites/ValueProvidersWebSite/CustomValueProviderFactory.cs index 2c482ace11..0973c9624c 100644 --- a/test/WebSites/ValueProvidersSite/CustomValueProviderFactory.cs +++ b/test/WebSites/ValueProvidersWebSite/CustomValueProviderFactory.cs @@ -6,7 +6,7 @@ using System.Globalization; using System.Threading.Tasks; using Microsoft.AspNet.Mvc.ModelBinding; -namespace ValueProvidersSite +namespace ValueProvidersWebSite { public class CustomValueProviderFactory : IValueProviderFactory { diff --git a/test/WebSites/ValueProvidersSite/FlagsEnum.cs b/test/WebSites/ValueProvidersWebSite/FlagsEnum.cs similarity index 91% rename from test/WebSites/ValueProvidersSite/FlagsEnum.cs rename to test/WebSites/ValueProvidersWebSite/FlagsEnum.cs index 766ac8f6b4..7ecfb95166 100644 --- a/test/WebSites/ValueProvidersSite/FlagsEnum.cs +++ b/test/WebSites/ValueProvidersWebSite/FlagsEnum.cs @@ -3,7 +3,7 @@ using System; -namespace ValueProvidersSite +namespace ValueProvidersWebSite { [Flags] public enum FlagsEnum diff --git a/test/WebSites/ValueProvidersSite/HomeController.cs b/test/WebSites/ValueProvidersWebSite/HomeController.cs similarity index 96% rename from test/WebSites/ValueProvidersSite/HomeController.cs rename to test/WebSites/ValueProvidersWebSite/HomeController.cs index 12147841f8..e23d703c05 100644 --- a/test/WebSites/ValueProvidersSite/HomeController.cs +++ b/test/WebSites/ValueProvidersWebSite/HomeController.cs @@ -3,7 +3,7 @@ using Microsoft.AspNet.Mvc; -namespace ValueProvidersSite +namespace ValueProvidersWebSite { public class HomeController { diff --git a/test/WebSites/ValueProvidersSite/Startup.cs b/test/WebSites/ValueProvidersWebSite/Startup.cs similarity index 96% rename from test/WebSites/ValueProvidersSite/Startup.cs rename to test/WebSites/ValueProvidersWebSite/Startup.cs index 1d028525e5..b833dd39bb 100644 --- a/test/WebSites/ValueProvidersSite/Startup.cs +++ b/test/WebSites/ValueProvidersWebSite/Startup.cs @@ -5,7 +5,7 @@ using Microsoft.AspNet.Builder; using Microsoft.AspNet.Mvc; using Microsoft.Framework.DependencyInjection; -namespace ValueProvidersSite +namespace ValueProvidersWebSite { public class Startup { diff --git a/test/WebSites/ValueProvidersSite/ValueProvidersSite.kproj b/test/WebSites/ValueProvidersWebSite/ValueProvidersWebSite.kproj similarity index 100% rename from test/WebSites/ValueProvidersSite/ValueProvidersSite.kproj rename to test/WebSites/ValueProvidersWebSite/ValueProvidersWebSite.kproj diff --git a/test/WebSites/ValueProvidersSite/project.json b/test/WebSites/ValueProvidersWebSite/project.json similarity index 100% rename from test/WebSites/ValueProvidersSite/project.json rename to test/WebSites/ValueProvidersWebSite/project.json diff --git a/test/WebSites/ValueProvidersSite/wwwroot/readme.md b/test/WebSites/ValueProvidersWebSite/wwwroot/readme.md similarity index 100% rename from test/WebSites/ValueProvidersSite/wwwroot/readme.md rename to test/WebSites/ValueProvidersWebSite/wwwroot/readme.md