diff --git a/Directory.Build.props b/Directory.Build.props index 13fc262b49..900cc3b861 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -1,5 +1,4 @@ - - + diff --git a/Directory.Build.targets b/Directory.Build.targets index 8c119d5413..bc118fd907 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,2 +1,14 @@ - + + + + <_BootstrapperFile Condition=" $([MSBuild]::IsOSUnixLike()) ">build.sh + <_BootstrapperFile Condition="! $([MSBuild]::IsOSUnixLike()) ">build.cmd + <_BootstrapperError> + Package references have not been pinned. Run './$(_BootstrapperFile) /t:Pin'. + Also, you can run './$(_BootstrapperFile) /t:Restore' which will pin *and* restore packages. '$(_BootstrapperFile)' can be found in '$(MSBuildThisFileDirectory)'. + + + + + diff --git a/Mvc.NoFun.sln b/Mvc.NoFun.sln index 61b9bb2434..083462788e 100644 --- a/Mvc.NoFun.sln +++ b/Mvc.NoFun.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26814.0 +VisualStudioVersion = 15.0.26730.10 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{DAAE4C74-D06F-4874-A166-33305D2643CE}" EndProject @@ -12,7 +12,7 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}" ProjectSection(SolutionItems) = preProject test\Directory.Build.props = test\Directory.Build.props - test\Directory.Build.targets = test\Directory.Build.targets + test\MvcTests.ruleset = test\MvcTests.ruleset EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc", "src\Microsoft.AspNetCore.Mvc\Microsoft.AspNetCore.Mvc.csproj", "{079EFA1F-0B0A-4853-B27B-5780D111CD85}" @@ -79,7 +79,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Ra EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.RazorPages.Test", "test\Microsoft.AspNetCore.Mvc.RazorPages.Test\Microsoft.AspNetCore.Mvc.RazorPages.Test.csproj", "{0AB46520-F441-4E01-B444-08F4D23F8B1B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Performance", "test\Microsoft.AspNetCore.Mvc.Performance\Microsoft.AspNetCore.Mvc.Performance.csproj", "{28D4DA20-6E13-47F9-80AE-D6AA7699CC35}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Performance", "benchmarks\Microsoft.AspNetCore.Mvc.Performance\Microsoft.AspNetCore.Mvc.Performance.csproj", "{28D4DA20-6E13-47F9-80AE-D6AA7699CC35}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4E1795C3-60C5-4AD2-A15F-93F6CE8FAD36}" ProjectSection(SolutionItems) = preProject @@ -102,6 +102,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution version.xml = version.xml EndProjectSection EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarks", "benchmarks", "{44546170-35BF-448F-88F5-4331AE67AEAE}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -525,7 +527,7 @@ Global {14ED4476-9F24-4776-8417-EA6927F6C9C9} = {DAAE4C74-D06F-4874-A166-33305D2643CE} {CF322BE1-E1FE-4CFD-8FCA-16A14B905D53} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E} {0AB46520-F441-4E01-B444-08F4D23F8B1B} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} - {28D4DA20-6E13-47F9-80AE-D6AA7699CC35} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} + {28D4DA20-6E13-47F9-80AE-D6AA7699CC35} = {44546170-35BF-448F-88F5-4331AE67AEAE} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {D003597F-372F-4068-A2F0-353BE3C3B39A} diff --git a/Mvc.sln b/Mvc.sln index f6a565c1a7..34b1cedaee 100644 --- a/Mvc.sln +++ b/Mvc.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26814.0 +VisualStudioVersion = 15.0.26730.10 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{DAAE4C74-D06F-4874-A166-33305D2643CE}" EndProject @@ -12,7 +12,6 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1}" ProjectSection(SolutionItems) = preProject test\Directory.Build.props = test\Directory.Build.props - test\Directory.Build.targets = test\Directory.Build.targets test\MvcTests.ruleset = test\MvcTests.ruleset EndProjectSection EndProject @@ -28,7 +27,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Co EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "WebSites", "WebSites", "{16703B76-C9F7-4C75-AE6C-53D92E308E3C}" ProjectSection(SolutionItems) = preProject - test\WebSites\Directory.Build.targets = test\WebSites\Directory.Build.targets + test\WebSites\Directory.Build.props = test\WebSites\Directory.Build.props EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.FunctionalTests", "test\Microsoft.AspNetCore.Mvc.FunctionalTests\Microsoft.AspNetCore.Mvc.FunctionalTests.csproj", "{323D0C04-B518-4A8F-8A8E-3546AD153D34}" @@ -129,7 +128,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Ra EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RazorPagesWebSite", "test\WebSites\RazorPagesWebSite\RazorPagesWebSite.csproj", "{4BA6EC9A-B6D9-41F2-BFDA-D82B22D80352}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Performance", "test\Microsoft.AspNetCore.Mvc.Performance\Microsoft.AspNetCore.Mvc.Performance.csproj", "{F16CEE0D-A28E-43BD-802F-99BAFE4BA7CE}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Performance", "benchmarks\Microsoft.AspNetCore.Mvc.Performance\Microsoft.AspNetCore.Mvc.Performance.csproj", "{F16CEE0D-A28E-43BD-802F-99BAFE4BA7CE}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Testing", "src\Microsoft.AspNetCore.Mvc.Testing\Microsoft.AspNetCore.Mvc.Testing.csproj", "{7500B228-1769-4CFB-A571-3DFAC6678A06}" EndProject @@ -154,6 +153,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution version.xml = version.xml EndProjectSection EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarks", "benchmarks", "{FDC66952-A3EA-4074-899E-C29816BF7C1F}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -850,7 +851,7 @@ Global {CF322BE1-E1FE-4CFD-8FCA-16A14B905D53} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E} {0AB46520-F441-4E01-B444-08F4D23F8B1B} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} {4BA6EC9A-B6D9-41F2-BFDA-D82B22D80352} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C} - {F16CEE0D-A28E-43BD-802F-99BAFE4BA7CE} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} + {F16CEE0D-A28E-43BD-802F-99BAFE4BA7CE} = {FDC66952-A3EA-4074-899E-C29816BF7C1F} {7500B228-1769-4CFB-A571-3DFAC6678A06} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution diff --git a/NuGet.config b/NuGet.config index 4e8a1f6de1..20060c934e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -3,7 +3,6 @@ - diff --git a/README.md b/README.md index 60ca971b1a..c3c30b0da9 100644 --- a/README.md +++ b/README.md @@ -18,3 +18,12 @@ Related community projects: * [AspNetCoreImageTagHelper](https://github.com/ignatandrei/AspNetCoreImageTagHelper): Tag helper for rendering images as inline base64 data. This project is part of ASP.NET Core. You can find samples, documentation and getting started instructions for ASP.NET Core at the [Home](https://github.com/aspnet/home) repo. + +## Building from source + +To run a complete build on command line only, execute `build.cmd` or `build.sh` without arguments. + +Before opening this project in Visual Studio or VS Code, execute `build.cmd /t:Restore` (Windows) or `./build.sh /t:Restore` (Linux/macOS). +This will execute only the part of the build script that downloads and initializes a few required build tools and packages. + +See [developer documentation](https://github.com/aspnet/Home/wiki) for more details. diff --git a/test/Microsoft.AspNetCore.Mvc.Performance/ActionSelectorBenchmark.cs b/benchmarks/Microsoft.AspNetCore.Mvc.Performance/ActionSelectorBenchmark.cs similarity index 100% rename from test/Microsoft.AspNetCore.Mvc.Performance/ActionSelectorBenchmark.cs rename to benchmarks/Microsoft.AspNetCore.Mvc.Performance/ActionSelectorBenchmark.cs diff --git a/test/Microsoft.AspNetCore.Mvc.Performance/Microsoft.AspNetCore.Mvc.Performance.csproj b/benchmarks/Microsoft.AspNetCore.Mvc.Performance/Microsoft.AspNetCore.Mvc.Performance.csproj similarity index 75% rename from test/Microsoft.AspNetCore.Mvc.Performance/Microsoft.AspNetCore.Mvc.Performance.csproj rename to benchmarks/Microsoft.AspNetCore.Mvc.Performance/Microsoft.AspNetCore.Mvc.Performance.csproj index 9261f6caab..49bc12cb10 100644 --- a/test/Microsoft.AspNetCore.Mvc.Performance/Microsoft.AspNetCore.Mvc.Performance.csproj +++ b/benchmarks/Microsoft.AspNetCore.Mvc.Performance/Microsoft.AspNetCore.Mvc.Performance.csproj @@ -1,4 +1,4 @@ - + netcoreapp2.0;net461 @@ -6,7 +6,6 @@ Exe true true - false @@ -14,7 +13,7 @@ - + diff --git a/test/Microsoft.AspNetCore.Mvc.Performance/Program.cs b/benchmarks/Microsoft.AspNetCore.Mvc.Performance/Program.cs similarity index 100% rename from test/Microsoft.AspNetCore.Mvc.Performance/Program.cs rename to benchmarks/Microsoft.AspNetCore.Mvc.Performance/Program.cs diff --git a/test/Microsoft.AspNetCore.Mvc.Performance/configs/CoreConfig.cs b/benchmarks/Microsoft.AspNetCore.Mvc.Performance/configs/CoreConfig.cs similarity index 100% rename from test/Microsoft.AspNetCore.Mvc.Performance/configs/CoreConfig.cs rename to benchmarks/Microsoft.AspNetCore.Mvc.Performance/configs/CoreConfig.cs diff --git a/test/Microsoft.AspNetCore.Mvc.Performance/readme.md b/benchmarks/Microsoft.AspNetCore.Mvc.Performance/readme.md similarity index 100% rename from test/Microsoft.AspNetCore.Mvc.Performance/readme.md rename to benchmarks/Microsoft.AspNetCore.Mvc.Performance/readme.md diff --git a/build/dependencies.props b/build/dependencies.props deleted file mode 100644 index 9db4a00489..0000000000 --- a/build/dependencies.props +++ /dev/null @@ -1,22 +0,0 @@ - - - 2.1.0-* - 0.10.3 - 4.4.0-* - 4.4.1-* - 2.0.0-* - 4.2.1 - 1.0.5 - 2.1.1-* - 1.0.1 - 4.7.49 - 2.0.0-* - 2.0.0-* - 2.3.1 - 2.0.0-* - 15.3.0 - 5.2.2 - 2.3.0-beta4-build3742 - 0.6.1 - - diff --git a/build/repo.props b/build/repo.props index f8d955a305..89cfc6dae2 100644 --- a/build/repo.props +++ b/build/repo.props @@ -1,8 +1,9 @@ - + - + + diff --git a/samples/MvcSandbox/MvcSandbox.csproj b/samples/MvcSandbox/MvcSandbox.csproj index 407516338c..1c7bf8f9b4 100644 --- a/samples/MvcSandbox/MvcSandbox.csproj +++ b/samples/MvcSandbox/MvcSandbox.csproj @@ -8,13 +8,13 @@ - - - - - - - + + + + + + + diff --git a/src/Directory.Build.props b/src/Directory.Build.props index e150035ea9..9d9a3de33a 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,7 +1,7 @@ - + - + diff --git a/src/Microsoft.AspNetCore.Mvc.Abstractions/Microsoft.AspNetCore.Mvc.Abstractions.csproj b/src/Microsoft.AspNetCore.Mvc.Abstractions/Microsoft.AspNetCore.Mvc.Abstractions.csproj index e266b7ac35..d9d8a49007 100644 --- a/src/Microsoft.AspNetCore.Mvc.Abstractions/Microsoft.AspNetCore.Mvc.Abstractions.csproj +++ b/src/Microsoft.AspNetCore.Mvc.Abstractions/Microsoft.AspNetCore.Mvc.Abstractions.csproj @@ -1,4 +1,4 @@ - + ASP.NET Core MVC abstractions and interfaces for action invocation and dispatching, authorization, action filters, formatters, model binding, routing, validation, and more. @@ -11,12 +11,12 @@ Microsoft.AspNetCore.Mvc.IActionResult - - - - - - + + + + + + diff --git a/src/Microsoft.AspNetCore.Mvc.ApiExplorer/Microsoft.AspNetCore.Mvc.ApiExplorer.csproj b/src/Microsoft.AspNetCore.Mvc.ApiExplorer/Microsoft.AspNetCore.Mvc.ApiExplorer.csproj index 0b96a038cb..de69666a1f 100644 --- a/src/Microsoft.AspNetCore.Mvc.ApiExplorer/Microsoft.AspNetCore.Mvc.ApiExplorer.csproj +++ b/src/Microsoft.AspNetCore.Mvc.ApiExplorer/Microsoft.AspNetCore.Mvc.ApiExplorer.csproj @@ -11,9 +11,9 @@ - - - + + + diff --git a/src/Microsoft.AspNetCore.Mvc.Core/Microsoft.AspNetCore.Mvc.Core.csproj b/src/Microsoft.AspNetCore.Mvc.Core/Microsoft.AspNetCore.Mvc.Core.csproj index fe6c509bc9..252f0052cd 100644 --- a/src/Microsoft.AspNetCore.Mvc.Core/Microsoft.AspNetCore.Mvc.Core.csproj +++ b/src/Microsoft.AspNetCore.Mvc.Core/Microsoft.AspNetCore.Mvc.Core.csproj @@ -19,24 +19,24 @@ Microsoft.AspNetCore.Mvc.RouteAttribute - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + diff --git a/src/Microsoft.AspNetCore.Mvc.Cors/Microsoft.AspNetCore.Mvc.Cors.csproj b/src/Microsoft.AspNetCore.Mvc.Cors/Microsoft.AspNetCore.Mvc.Cors.csproj index c30d2bd37d..98fe43f073 100644 --- a/src/Microsoft.AspNetCore.Mvc.Cors/Microsoft.AspNetCore.Mvc.Cors.csproj +++ b/src/Microsoft.AspNetCore.Mvc.Cors/Microsoft.AspNetCore.Mvc.Cors.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Microsoft.AspNetCore.Mvc.DataAnnotations.csproj b/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Microsoft.AspNetCore.Mvc.DataAnnotations.csproj index 1b992652b4..0f8fc9e898 100644 --- a/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Microsoft.AspNetCore.Mvc.DataAnnotations.csproj +++ b/src/Microsoft.AspNetCore.Mvc.DataAnnotations/Microsoft.AspNetCore.Mvc.DataAnnotations.csproj @@ -1,4 +1,4 @@ - + ASP.NET Core MVC metadata and validation system using System.ComponentModel.DataAnnotations. @@ -11,9 +11,9 @@ - - - - + + + + diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Microsoft.AspNetCore.Mvc.Formatters.Json.csproj b/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Microsoft.AspNetCore.Mvc.Formatters.Json.csproj index 58095c1f9f..d14c390010 100644 --- a/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Microsoft.AspNetCore.Mvc.Formatters.Json.csproj +++ b/src/Microsoft.AspNetCore.Mvc.Formatters.Json/Microsoft.AspNetCore.Mvc.Formatters.Json.csproj @@ -11,7 +11,7 @@ - - + + diff --git a/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj b/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj index b80ace4330..d461f0a266 100644 --- a/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj +++ b/src/Microsoft.AspNetCore.Mvc.Formatters.Xml/Microsoft.AspNetCore.Mvc.Formatters.Xml.csproj @@ -1,4 +1,4 @@ - + ASP.NET Core MVC formatters for XML input and output using DataContractSerializer and XmlSerializer. @@ -11,7 +11,7 @@ - - + + diff --git a/src/Microsoft.AspNetCore.Mvc.Localization/Microsoft.AspNetCore.Mvc.Localization.csproj b/src/Microsoft.AspNetCore.Mvc.Localization/Microsoft.AspNetCore.Mvc.Localization.csproj index 4853223475..5bc1ccda5d 100644 --- a/src/Microsoft.AspNetCore.Mvc.Localization/Microsoft.AspNetCore.Mvc.Localization.csproj +++ b/src/Microsoft.AspNetCore.Mvc.Localization/Microsoft.AspNetCore.Mvc.Localization.csproj @@ -14,10 +14,10 @@ Microsoft.AspNetCore.Mvc.Localization.IViewLocalizer - - - - + + + + diff --git a/src/Microsoft.AspNetCore.Mvc.Razor/Microsoft.AspNetCore.Mvc.Razor.csproj b/src/Microsoft.AspNetCore.Mvc.Razor/Microsoft.AspNetCore.Mvc.Razor.csproj index 8daa1e9d0b..ac31859f57 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor/Microsoft.AspNetCore.Mvc.Razor.csproj +++ b/src/Microsoft.AspNetCore.Mvc.Razor/Microsoft.AspNetCore.Mvc.Razor.csproj @@ -11,15 +11,15 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/src/Microsoft.AspNetCore.Mvc.RazorPages/Microsoft.AspNetCore.Mvc.RazorPages.csproj b/src/Microsoft.AspNetCore.Mvc.RazorPages/Microsoft.AspNetCore.Mvc.RazorPages.csproj index edd559c56a..2d9716088f 100644 --- a/src/Microsoft.AspNetCore.Mvc.RazorPages/Microsoft.AspNetCore.Mvc.RazorPages.csproj +++ b/src/Microsoft.AspNetCore.Mvc.RazorPages/Microsoft.AspNetCore.Mvc.RazorPages.csproj @@ -11,10 +11,10 @@ - - - - + + + + diff --git a/src/Microsoft.AspNetCore.Mvc.TagHelpers/Microsoft.AspNetCore.Mvc.TagHelpers.csproj b/src/Microsoft.AspNetCore.Mvc.TagHelpers/Microsoft.AspNetCore.Mvc.TagHelpers.csproj index f6a7191df6..5682d2d11a 100644 --- a/src/Microsoft.AspNetCore.Mvc.TagHelpers/Microsoft.AspNetCore.Mvc.TagHelpers.csproj +++ b/src/Microsoft.AspNetCore.Mvc.TagHelpers/Microsoft.AspNetCore.Mvc.TagHelpers.csproj @@ -15,12 +15,12 @@ - - - - - - - + + + + + + + diff --git a/src/Microsoft.AspNetCore.Mvc.Testing/Microsoft.AspNetCore.Mvc.Testing.csproj b/src/Microsoft.AspNetCore.Mvc.Testing/Microsoft.AspNetCore.Mvc.Testing.csproj index d067ee9915..c788e0e7e5 100644 --- a/src/Microsoft.AspNetCore.Mvc.Testing/Microsoft.AspNetCore.Mvc.Testing.csproj +++ b/src/Microsoft.AspNetCore.Mvc.Testing/Microsoft.AspNetCore.Mvc.Testing.csproj @@ -1,4 +1,4 @@ - + Support for writing functional tests for MVC applications. @@ -11,7 +11,7 @@ - + diff --git a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj index 7eab349288..89c17e1c8a 100644 --- a/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj +++ b/src/Microsoft.AspNetCore.Mvc.ViewFeatures/Microsoft.AspNetCore.Mvc.ViewFeatures.csproj @@ -1,4 +1,4 @@ - + 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. @@ -18,18 +18,18 @@ Microsoft.AspNetCore.Mvc.ViewComponent - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Microsoft.AspNetCore.Mvc.WebApiCompatShim.csproj b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Microsoft.AspNetCore.Mvc.WebApiCompatShim.csproj index ab8d10b4bd..e2167505b8 100644 --- a/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Microsoft.AspNetCore.Mvc.WebApiCompatShim.csproj +++ b/src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/Microsoft.AspNetCore.Mvc.WebApiCompatShim.csproj @@ -1,4 +1,4 @@ - + Provides compatibility in ASP.NET Core MVC with ASP.NET Web API 2 to simplify migration of existing Web API implementations. @@ -17,9 +17,9 @@ System.Web.Http.ApiController - - - + + + diff --git a/src/Microsoft.AspNetCore.Mvc/Microsoft.AspNetCore.Mvc.csproj b/src/Microsoft.AspNetCore.Mvc/Microsoft.AspNetCore.Mvc.csproj index b690319433..ee16b24196 100644 --- a/src/Microsoft.AspNetCore.Mvc/Microsoft.AspNetCore.Mvc.csproj +++ b/src/Microsoft.AspNetCore.Mvc/Microsoft.AspNetCore.Mvc.csproj @@ -18,8 +18,8 @@ - - + + diff --git a/test/Directory.Build.props b/test/Directory.Build.props index ec72533796..834b4c5d93 100644 --- a/test/Directory.Build.props +++ b/test/Directory.Build.props @@ -6,4 +6,13 @@ xUnit1026:$(WarningsNotAsErrors) $(MSBuildThisFileDirectory)MvcTests.ruleset + + + + + + + + + diff --git a/test/Directory.Build.targets b/test/Directory.Build.targets deleted file mode 100644 index 5c49d2f8a3..0000000000 --- a/test/Directory.Build.targets +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/Microsoft.AspNetCore.Mvc.Abstractions.Test.csproj b/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/Microsoft.AspNetCore.Mvc.Abstractions.Test.csproj index 45535ceef5..88adffec6c 100644 --- a/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/Microsoft.AspNetCore.Mvc.Abstractions.Test.csproj +++ b/test/Microsoft.AspNetCore.Mvc.Abstractions.Test/Microsoft.AspNetCore.Mvc.Abstractions.Test.csproj @@ -8,7 +8,7 @@ - + diff --git a/test/Microsoft.AspNetCore.Mvc.Core.Test/Microsoft.AspNetCore.Mvc.Core.Test.csproj b/test/Microsoft.AspNetCore.Mvc.Core.Test/Microsoft.AspNetCore.Mvc.Core.Test.csproj index 076d3ae94c..1c0e7a92e0 100644 --- a/test/Microsoft.AspNetCore.Mvc.Core.Test/Microsoft.AspNetCore.Mvc.Core.Test.csproj +++ b/test/Microsoft.AspNetCore.Mvc.Core.Test/Microsoft.AspNetCore.Mvc.Core.Test.csproj @@ -15,10 +15,10 @@ - - - - - + + + + + diff --git a/test/Microsoft.AspNetCore.Mvc.Cors.Test/Microsoft.AspNetCore.Mvc.Cors.Test.csproj b/test/Microsoft.AspNetCore.Mvc.Cors.Test/Microsoft.AspNetCore.Mvc.Cors.Test.csproj index 1a65cb33f2..ed3852a374 100644 --- a/test/Microsoft.AspNetCore.Mvc.Cors.Test/Microsoft.AspNetCore.Mvc.Cors.Test.csproj +++ b/test/Microsoft.AspNetCore.Mvc.Cors.Test/Microsoft.AspNetCore.Mvc.Cors.Test.csproj @@ -9,8 +9,8 @@ - - + + diff --git a/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test.csproj b/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test.csproj index 52d973e3e9..99f654eb26 100644 --- a/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test.csproj +++ b/test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test/Microsoft.AspNetCore.Mvc.DataAnnotations.Test.csproj @@ -8,9 +8,9 @@ - - - + + + diff --git a/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test.csproj b/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test.csproj index d5c6715260..d0bd47fcfb 100644 --- a/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test.csproj +++ b/test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test/Microsoft.AspNetCore.Mvc.Formatters.Json.Test.csproj @@ -8,9 +8,9 @@ - - - + + + diff --git a/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test.csproj b/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test.csproj index 9eac042541..4875e51d1b 100644 --- a/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test.csproj +++ b/test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test/Microsoft.AspNetCore.Mvc.Formatters.Xml.Test.csproj @@ -8,7 +8,7 @@ - + diff --git a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj index 1a8beea409..58136714a7 100644 --- a/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj +++ b/test/Microsoft.AspNetCore.Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj @@ -45,11 +45,11 @@ - - - - - - + + + + + + diff --git a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/Microsoft.AspNetCore.Mvc.IntegrationTests.csproj b/test/Microsoft.AspNetCore.Mvc.IntegrationTests/Microsoft.AspNetCore.Mvc.IntegrationTests.csproj index 8af248fdd8..3472de77b8 100644 --- a/test/Microsoft.AspNetCore.Mvc.IntegrationTests/Microsoft.AspNetCore.Mvc.IntegrationTests.csproj +++ b/test/Microsoft.AspNetCore.Mvc.IntegrationTests/Microsoft.AspNetCore.Mvc.IntegrationTests.csproj @@ -9,8 +9,8 @@ - - + + diff --git a/test/Microsoft.AspNetCore.Mvc.Localization.Test/Microsoft.AspNetCore.Mvc.Localization.Test.csproj b/test/Microsoft.AspNetCore.Mvc.Localization.Test/Microsoft.AspNetCore.Mvc.Localization.Test.csproj index 6a42026500..251b042a0f 100644 --- a/test/Microsoft.AspNetCore.Mvc.Localization.Test/Microsoft.AspNetCore.Mvc.Localization.Test.csproj +++ b/test/Microsoft.AspNetCore.Mvc.Localization.Test/Microsoft.AspNetCore.Mvc.Localization.Test.csproj @@ -9,7 +9,7 @@ - + diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.Test/Microsoft.AspNetCore.Mvc.Razor.Test.csproj b/test/Microsoft.AspNetCore.Mvc.Razor.Test/Microsoft.AspNetCore.Mvc.Razor.Test.csproj index e59d54c0b2..63985c9325 100644 --- a/test/Microsoft.AspNetCore.Mvc.Razor.Test/Microsoft.AspNetCore.Mvc.Razor.Test.csproj +++ b/test/Microsoft.AspNetCore.Mvc.Razor.Test/Microsoft.AspNetCore.Mvc.Razor.Test.csproj @@ -16,10 +16,10 @@ - - - - + + + + diff --git a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Microsoft.AspNetCore.Mvc.RazorPages.Test.csproj b/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Microsoft.AspNetCore.Mvc.RazorPages.Test.csproj index f101c287be..086089f568 100644 --- a/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Microsoft.AspNetCore.Mvc.RazorPages.Test.csproj +++ b/test/Microsoft.AspNetCore.Mvc.RazorPages.Test/Microsoft.AspNetCore.Mvc.RazorPages.Test.csproj @@ -10,9 +10,9 @@ - - - + + + diff --git a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/Microsoft.AspNetCore.Mvc.TagHelpers.Test.csproj b/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/Microsoft.AspNetCore.Mvc.TagHelpers.Test.csproj index 18fd42e428..e89a2ce02b 100644 --- a/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/Microsoft.AspNetCore.Mvc.TagHelpers.Test.csproj +++ b/test/Microsoft.AspNetCore.Mvc.TagHelpers.Test/Microsoft.AspNetCore.Mvc.TagHelpers.Test.csproj @@ -9,10 +9,10 @@ - - - - + + + + diff --git a/test/Microsoft.AspNetCore.Mvc.Test/Microsoft.AspNetCore.Mvc.Test.csproj b/test/Microsoft.AspNetCore.Mvc.Test/Microsoft.AspNetCore.Mvc.Test.csproj index d5256ce762..e5b02daed3 100644 --- a/test/Microsoft.AspNetCore.Mvc.Test/Microsoft.AspNetCore.Mvc.Test.csproj +++ b/test/Microsoft.AspNetCore.Mvc.Test/Microsoft.AspNetCore.Mvc.Test.csproj @@ -9,8 +9,8 @@ - - - + + + diff --git a/test/Microsoft.AspNetCore.Mvc.TestCommon/Microsoft.AspNetCore.Mvc.TestCommon.csproj b/test/Microsoft.AspNetCore.Mvc.TestCommon/Microsoft.AspNetCore.Mvc.TestCommon.csproj index d314ac638c..d8cf78cfc4 100644 --- a/test/Microsoft.AspNetCore.Mvc.TestCommon/Microsoft.AspNetCore.Mvc.TestCommon.csproj +++ b/test/Microsoft.AspNetCore.Mvc.TestCommon/Microsoft.AspNetCore.Mvc.TestCommon.csproj @@ -3,20 +3,19 @@ netcoreapp2.0;net461 netcoreapp2.0 - false + - - - - - - - + + + + + + diff --git a/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.csproj b/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.csproj index d91643e791..ee25a6341d 100644 --- a/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.csproj +++ b/test/Microsoft.AspNetCore.Mvc.TestDiagnosticListener/Microsoft.AspNetCore.Mvc.TestDiagnosticListener.csproj @@ -3,10 +3,9 @@ netcoreapp2.0;net461 netcoreapp2.0 - false - + diff --git a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test.csproj b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test.csproj index 0bfbe63036..534753cd42 100644 --- a/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test.csproj +++ b/test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test/Microsoft.AspNetCore.Mvc.ViewFeatures.Test.csproj @@ -10,7 +10,7 @@ - - + + diff --git a/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest.csproj b/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest.csproj index 2f70d90b04..491fb95abf 100644 --- a/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest.csproj +++ b/test/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest/Microsoft.AspNetCore.Mvc.WebApiCompatShimTest.csproj @@ -14,9 +14,9 @@ - - - + + + diff --git a/test/WebSites/ApiExplorerWebSite/ApiExplorerWebSite.csproj b/test/WebSites/ApiExplorerWebSite/ApiExplorerWebSite.csproj index 09e61eea87..f8c35fb507 100644 --- a/test/WebSites/ApiExplorerWebSite/ApiExplorerWebSite.csproj +++ b/test/WebSites/ApiExplorerWebSite/ApiExplorerWebSite.csproj @@ -1,4 +1,4 @@ - + netcoreapp2.0;net461 @@ -9,8 +9,8 @@ - - - + + + diff --git a/test/WebSites/ApplicationModelWebSite/ApplicationModelWebSite.csproj b/test/WebSites/ApplicationModelWebSite/ApplicationModelWebSite.csproj index 0b8ef6b8d6..719d7318ab 100644 --- a/test/WebSites/ApplicationModelWebSite/ApplicationModelWebSite.csproj +++ b/test/WebSites/ApplicationModelWebSite/ApplicationModelWebSite.csproj @@ -1,4 +1,4 @@ - + netcoreapp2.0;net461 @@ -8,8 +8,8 @@ - - - + + + diff --git a/test/WebSites/BasicWebSite/BasicWebSite.csproj b/test/WebSites/BasicWebSite/BasicWebSite.csproj index 0ef29a1349..c5fd68a314 100644 --- a/test/WebSites/BasicWebSite/BasicWebSite.csproj +++ b/test/WebSites/BasicWebSite/BasicWebSite.csproj @@ -1,4 +1,4 @@ - + netcoreapp2.0;net461 @@ -9,9 +9,9 @@ - - - - + + + + diff --git a/test/WebSites/ControllersFromServicesWebSite/ControllersFromServicesWebSite.csproj b/test/WebSites/ControllersFromServicesWebSite/ControllersFromServicesWebSite.csproj index 69b3fb48b7..dc24ee222f 100644 --- a/test/WebSites/ControllersFromServicesWebSite/ControllersFromServicesWebSite.csproj +++ b/test/WebSites/ControllersFromServicesWebSite/ControllersFromServicesWebSite.csproj @@ -1,4 +1,4 @@ - + netcoreapp2.0;net461 @@ -9,9 +9,9 @@ - - - - + + + + diff --git a/test/WebSites/CorsWebSite/CorsWebSite.csproj b/test/WebSites/CorsWebSite/CorsWebSite.csproj index 7e2b973385..c8cd75b882 100644 --- a/test/WebSites/CorsWebSite/CorsWebSite.csproj +++ b/test/WebSites/CorsWebSite/CorsWebSite.csproj @@ -1,4 +1,4 @@ - + netcoreapp2.0;net461 @@ -9,9 +9,9 @@ - - - - + + + + diff --git a/test/WebSites/Directory.Build.props b/test/WebSites/Directory.Build.props new file mode 100644 index 0000000000..c1b2f8c824 --- /dev/null +++ b/test/WebSites/Directory.Build.props @@ -0,0 +1,4 @@ + + + + diff --git a/test/WebSites/Directory.Build.targets b/test/WebSites/Directory.Build.targets deleted file mode 100644 index 58c19e41c3..0000000000 --- a/test/WebSites/Directory.Build.targets +++ /dev/null @@ -1,7 +0,0 @@ - - - false - - - - diff --git a/test/WebSites/ErrorPageMiddlewareWebSite/ErrorPageMiddlewareWebSite.csproj b/test/WebSites/ErrorPageMiddlewareWebSite/ErrorPageMiddlewareWebSite.csproj index 8c7a901f34..c204946abc 100644 --- a/test/WebSites/ErrorPageMiddlewareWebSite/ErrorPageMiddlewareWebSite.csproj +++ b/test/WebSites/ErrorPageMiddlewareWebSite/ErrorPageMiddlewareWebSite.csproj @@ -1,4 +1,4 @@ - + netcoreapp2.0;net461 @@ -8,9 +8,9 @@ - - - - + + + + diff --git a/test/WebSites/FilesWebSite/FilesWebSite.csproj b/test/WebSites/FilesWebSite/FilesWebSite.csproj index 68ba74bc11..31a954b703 100644 --- a/test/WebSites/FilesWebSite/FilesWebSite.csproj +++ b/test/WebSites/FilesWebSite/FilesWebSite.csproj @@ -1,4 +1,4 @@ - + netcoreapp2.0;net461 @@ -13,9 +13,9 @@ - - - - + + + + diff --git a/test/WebSites/FiltersWebSite/FiltersWebSite.csproj b/test/WebSites/FiltersWebSite/FiltersWebSite.csproj index 04ff2bf787..b6a5ad85a0 100644 --- a/test/WebSites/FiltersWebSite/FiltersWebSite.csproj +++ b/test/WebSites/FiltersWebSite/FiltersWebSite.csproj @@ -1,4 +1,4 @@ - + netcoreapp2.0;net461 @@ -9,10 +9,10 @@ - - - - - + + + + + diff --git a/test/WebSites/FormatterWebSite/FormatterWebSite.csproj b/test/WebSites/FormatterWebSite/FormatterWebSite.csproj index 09e61eea87..f8c35fb507 100644 --- a/test/WebSites/FormatterWebSite/FormatterWebSite.csproj +++ b/test/WebSites/FormatterWebSite/FormatterWebSite.csproj @@ -1,4 +1,4 @@ - + netcoreapp2.0;net461 @@ -9,8 +9,8 @@ - - - + + + diff --git a/test/WebSites/HtmlGenerationWebSite/HtmlGenerationWebSite.csproj b/test/WebSites/HtmlGenerationWebSite/HtmlGenerationWebSite.csproj index 0b8ef6b8d6..719d7318ab 100644 --- a/test/WebSites/HtmlGenerationWebSite/HtmlGenerationWebSite.csproj +++ b/test/WebSites/HtmlGenerationWebSite/HtmlGenerationWebSite.csproj @@ -1,4 +1,4 @@ - + netcoreapp2.0;net461 @@ -8,8 +8,8 @@ - - - + + + diff --git a/test/WebSites/RazorPageExecutionInstrumentationWebSite/RazorPageExecutionInstrumentationWebSite.csproj b/test/WebSites/RazorPageExecutionInstrumentationWebSite/RazorPageExecutionInstrumentationWebSite.csproj index 752dbdfb0a..b88faa3869 100644 --- a/test/WebSites/RazorPageExecutionInstrumentationWebSite/RazorPageExecutionInstrumentationWebSite.csproj +++ b/test/WebSites/RazorPageExecutionInstrumentationWebSite/RazorPageExecutionInstrumentationWebSite.csproj @@ -1,4 +1,4 @@ - + netcoreapp2.0;net461 @@ -8,9 +8,9 @@ - - - - + + + + diff --git a/test/WebSites/RazorPagesWebSite/RazorPagesWebSite.csproj b/test/WebSites/RazorPagesWebSite/RazorPagesWebSite.csproj index bc1ea6eea2..a0e5c39128 100644 --- a/test/WebSites/RazorPagesWebSite/RazorPagesWebSite.csproj +++ b/test/WebSites/RazorPagesWebSite/RazorPagesWebSite.csproj @@ -8,9 +8,9 @@ - - - - + + + + diff --git a/test/WebSites/RazorWebSite/RazorWebSite.csproj b/test/WebSites/RazorWebSite/RazorWebSite.csproj index 528299715d..5ac6a97546 100644 --- a/test/WebSites/RazorWebSite/RazorWebSite.csproj +++ b/test/WebSites/RazorWebSite/RazorWebSite.csproj @@ -1,4 +1,4 @@ - + netcoreapp2.0;net461 @@ -13,10 +13,10 @@ - - - - - + + + + + diff --git a/test/WebSites/RoutingWebSite/RoutingWebSite.csproj b/test/WebSites/RoutingWebSite/RoutingWebSite.csproj index 0b8ef6b8d6..719d7318ab 100644 --- a/test/WebSites/RoutingWebSite/RoutingWebSite.csproj +++ b/test/WebSites/RoutingWebSite/RoutingWebSite.csproj @@ -1,4 +1,4 @@ - + netcoreapp2.0;net461 @@ -8,8 +8,8 @@ - - - + + + diff --git a/test/WebSites/SecurityWebSite/SecurityWebSite.csproj b/test/WebSites/SecurityWebSite/SecurityWebSite.csproj index 439975afd9..6f7ef27cb9 100644 --- a/test/WebSites/SecurityWebSite/SecurityWebSite.csproj +++ b/test/WebSites/SecurityWebSite/SecurityWebSite.csproj @@ -1,4 +1,4 @@ - + netcoreapp2.0;net461 @@ -8,8 +8,8 @@ - - - + + + diff --git a/test/WebSites/SimpleWebSite/SimpleWebSite.csproj b/test/WebSites/SimpleWebSite/SimpleWebSite.csproj index 25bd96cbd2..141809c107 100644 --- a/test/WebSites/SimpleWebSite/SimpleWebSite.csproj +++ b/test/WebSites/SimpleWebSite/SimpleWebSite.csproj @@ -1,4 +1,4 @@ - + netcoreapp2.0;net461 @@ -8,7 +8,7 @@ - - + + diff --git a/test/WebSites/TagHelpersWebSite/TagHelpersWebSite.csproj b/test/WebSites/TagHelpersWebSite/TagHelpersWebSite.csproj index fa012db5d4..bd4e838555 100644 --- a/test/WebSites/TagHelpersWebSite/TagHelpersWebSite.csproj +++ b/test/WebSites/TagHelpersWebSite/TagHelpersWebSite.csproj @@ -1,4 +1,4 @@ - + netcoreapp2.0;net461 @@ -9,8 +9,8 @@ - - - + + + diff --git a/test/WebSites/VersioningWebSite/VersioningWebSite.csproj b/test/WebSites/VersioningWebSite/VersioningWebSite.csproj index 0b8ef6b8d6..719d7318ab 100644 --- a/test/WebSites/VersioningWebSite/VersioningWebSite.csproj +++ b/test/WebSites/VersioningWebSite/VersioningWebSite.csproj @@ -1,4 +1,4 @@ - + netcoreapp2.0;net461 @@ -8,8 +8,8 @@ - - - + + + diff --git a/test/WebSites/WebApiCompatShimWebSite/WebApiCompatShimWebSite.csproj b/test/WebSites/WebApiCompatShimWebSite/WebApiCompatShimWebSite.csproj index bae3959e7b..4546c684fa 100644 --- a/test/WebSites/WebApiCompatShimWebSite/WebApiCompatShimWebSite.csproj +++ b/test/WebSites/WebApiCompatShimWebSite/WebApiCompatShimWebSite.csproj @@ -1,4 +1,4 @@ - + netcoreapp2.0;net461 @@ -11,8 +11,8 @@ - - - + + + diff --git a/test/WebSites/XmlFormattersWebSite/XmlFormattersWebSite.csproj b/test/WebSites/XmlFormattersWebSite/XmlFormattersWebSite.csproj index f26b49c4f8..5c12d004b0 100644 --- a/test/WebSites/XmlFormattersWebSite/XmlFormattersWebSite.csproj +++ b/test/WebSites/XmlFormattersWebSite/XmlFormattersWebSite.csproj @@ -1,4 +1,4 @@ - + netcoreapp2.0;net461 netcoreapp2.0 @@ -8,8 +8,8 @@ - - - + + +