From e5d943a7e3c5a7f9caeacba04ef5f072980a0009 Mon Sep 17 00:00:00 2001 From: John Luo Date: Wed, 9 Jan 2019 18:48:01 -0800 Subject: [PATCH 01/15] Convert MvcPrecomp to Reference (#6472) * Convert MvcPrecomp to use Reference and move to MVC --- build/buildorder.props | 1 - build/submodules.props | 1 - eng/Baseline.Designer.props | 12 + eng/Baseline.xml | 1 + eng/Dependencies.props | 1 + eng/ProjectReferences.props | 1 + src/Mvc/Mvc.sln | 577 ++++++++++++++++++ .../ViewCompilation.Tasks}/GetDotNetHost.cs | 0 ...ore.Mvc.Razor.ViewCompilation.Tasks.csproj | 18 + .../Internal/AssemblyMetadataGenerator.cs | 0 .../src}/Internal/CompilationOptions.cs | 0 .../src}/Internal/DebugHelper.cs | 0 .../src}/Internal/MvcServiceProvider.cs | 0 .../Internal/PrecompilationApplication.cs | 0 .../src}/Internal/PrecompileRunCommand.cs | 0 .../ViewCompilation/src}/Internal/SnkUtils.cs | 0 .../src}/Internal/ViewCompilationInfo.cs | 0 .../src}/Internal/ViewFileInfo.cs | 0 ...spNetCore.Mvc.Razor.ViewCompilation.csproj | 13 +- ...spNetCore.Mvc.Razor.ViewCompilation.nuspec | 0 .../ViewCompilation/src}/Program.cs | 0 .../src}/Properties/AssemblyInfo.cs | 0 .../ViewCompilation/src}/README.md | 13 +- .../src}/baseline.netcore.json | 0 ...pNetCore.Mvc.Razor.ViewCompilation.targets | 0 .../ViewCompilation/src}/lib/net461/_._ | 0 .../src}/lib/netcoreapp2.0/_._ | 0 .../CoreCLRApplicationTestFixture.cs | 0 .../CoreCLRTests/SimpleAppTest_CoreCLR.cs | 0 .../DesktopApplicationTestFixture.cs | 0 .../DesktopTests/SimpleAppTest_Desktop.cs | 2 +- .../Infrastructure/ApplicationPaths.cs | 6 +- .../Infrastructure/ApplicationTestFixture.cs | 0 .../Infrastructure/HttpClientExtensions.cs | 0 .../Infrastructure/PublishOnlyDeployer.cs | 0 .../Infrastructure/TestEmbeddedResource.cs | 0 ...zor.ViewCompilation.FunctionalTests.csproj | 50 ++ .../Properties/AssemblyInfo.cs | 0 .../Resources/SimpleAppTest.Home.Index.txt | 0 ...Core.Mvc.Razor.ViewCompilation.Test.csproj | 2 +- .../UnitTests}/PrecompileRunCommandTest.cs | 0 .../ApplicationUsingRelativePaths.csproj | 16 + .../Controllers/HomeController.cs | 0 .../ApplicationUsingRelativePaths/Program.cs | 0 .../ApplicationUsingRelativePaths/Startup.cs | 0 .../Views/Home/About.cshtml | 0 .../Views/Home/Index.cshtml | 0 .../Views/Shared/_Layout.cshtml | 0 .../Views/_ViewImports.cshtml | 0 .../Views/_ViewStart.cshtml | 0 .../ApplicationWithConfigureMvc.csproj | 17 + .../Controllers/HomeController.cs | 0 .../ApplicationWithConfigureMvc/Program.cs | 0 .../RazorRewriter.cs | 0 .../ApplicationWithConfigureMvc/Startup.cs | 0 .../Views/Home/Index.cshtml | 0 .../Views/Home/ViewWithPreprocessor.cshtml | 0 .../ApplicationWithCustomInputFiles.csproj | 21 + .../Controllers/HomeController.cs | 0 .../Program.cs | 0 .../Startup.cs | 0 .../Views/Home/About.cshtml | 0 .../Views/Home/Index.cshtml | 0 .../Views/Home/NotIncluded.cshtml | 0 .../ApplicationWithParseErrors.csproj | 16 + .../ApplicationWithParseErrors/Program.cs | 0 .../ApplicationWithParseErrors/Startup.cs | 0 .../Views/Home/About.cshtml | 0 .../Views/Home/Index.cshtml | 0 .../ApplicationWithRazorSdkNeitherUsed.csproj | 19 + .../Controllers/HomeController.cs | 0 .../Program.cs | 0 .../Startup.cs | 0 .../Views/Home/About.cshtml | 0 .../Views/Home/Index.cshtml | 0 .../Views/Shared/_Layout.cshtml | 0 .../Views/_ViewImports.cshtml | 0 .../Views/_ViewStart.cshtml | 0 ...ationWithRazorSdkPrecompilationUsed.csproj | 19 + .../Controllers/HomeController.cs | 0 .../Program.cs | 0 .../Startup.cs | 0 .../Views/Home/About.cshtml | 0 .../Views/Home/Index.cshtml | 0 .../Views/Shared/_Layout.cshtml | 0 .../Views/_ViewImports.cshtml | 0 .../Views/_ViewStart.cshtml | 0 .../ApplicationWithRazorSdkUsed.csproj | 14 + .../Controllers/HomeController.cs | 0 .../ApplicationWithRazorSdkUsed/Program.cs | 0 .../ApplicationWithRazorSdkUsed/Startup.cs | 0 .../Views/Home/About.cshtml | 0 .../Views/Home/Index.cshtml | 0 .../Views/Shared/_Layout.cshtml | 0 .../Views/_ViewImports.cshtml | 0 .../Views/_ViewStart.cshtml | 0 .../ApplicationWithTagHelpers.csproj | 20 + .../Components/CopyrightViewComponent.cs | 0 .../Controllers/HomeController.cs | 0 .../ApplicationWithTagHelpers/Program.cs | 0 .../ApplicationWithTagHelpers/Startup.cs | 0 .../TagHelpers/TestTagHelper.cs | 0 .../Views/Home/ClassLibraryTagHelper.cshtml | 0 .../Views/Home/LocalTagHelper.cshtml | 0 .../Components/Copyright/Default.cshtml | 0 .../Views/Shared/_Layout.cshtml | 0 .../Views/_ViewImports.cshtml | 0 .../Views/_ViewStart.cshtml | 0 .../ClassLibraryTagHelper/BoldTagHelper.cs | 0 .../ClassLibraryTagHelper.csproj | 2 +- .../testassets}/Directory.Build.props | 2 +- .../testassets}/Directory.Build.targets | 10 +- .../Areas/TestArea/Views/Home/Index.cshtml | 0 .../Controllers/HomeController.cs | 0 .../PublishWithEmbedViewSources/Program.cs | 0 .../PublishWithEmbedViewSources.csproj | 17 + .../PublishWithEmbedViewSources/Startup.cs | 0 .../Views/Home/About.cshtml | 0 .../Views/Home/Index.cshtml | 0 .../RazorPagesApp/Pages/Auth/Index.cshtml | 0 .../RazorPagesApp/Pages/Index.cshtml | 0 .../RazorPagesApp/Pages/Login.cshtml | 0 .../RazorPagesApp/Pages/MyPageModel.cs | 0 .../Nested1/Nested2/PageWithTagHelper.cshtml | 0 .../Pages/Nested1/_ViewImports.cshtml | 0 .../RazorPagesApp/Pages/PageWithModel.cshtml | 0 .../RazorPagesApp/Pages/PageWithRoute.cshtml | 0 .../RazorPagesApp/Pages/_PageStart.cshtml | 0 .../RazorPagesApp/Pages/_ViewImports.cshtml | 0 .../testassets}/RazorPagesApp/Program.cs | 0 .../RazorPagesApp/RazorPagesApp.csproj | 17 + .../testassets}/RazorPagesApp/Startup.cs | 0 .../RazorPagesApp/Views/Shared/_Layout.cshtml | 0 .../SimpleApp/Controllers/HomeController.cs | 0 .../testassets}/SimpleApp/Program.cs | 0 .../testassets/SimpleApp/SimpleApp.csproj | 17 + .../testassets}/SimpleApp/Startup.cs | 0 .../SimpleApp/Views/Home/About.cshtml | 0 .../SimpleApp/Views/Home/Index.cshtml | 0 .../SimpleApp/Views/Shared/_Layout.cshtml | 0 .../SimpleApp/Views/_ViewImports.cshtml | 0 .../SimpleApp/Views/_ViewStart.cshtml | 0 .../Controllers/HomeController.cs | 0 .../SimpleAppWithAssemblyRename/Program.cs | 0 .../SimpleAppWithAssemblyRename.csproj | 17 + .../SimpleAppWithAssemblyRename/Startup.cs | 0 .../Views/Home/Index.cshtml | 0 .../Views/_ViewImports.cshtml | 0 .../Controllers/HomeController.cs | 0 .../testassets}/StrongNamedApp/Program.cs | 0 .../testassets}/StrongNamedApp/Startup.cs | 0 .../StrongNamedApp/StrongNamedApp.csproj | 18 + .../StrongNamedApp/Views/Home/Index.cshtml | 0 src/MvcPrecompilation/.gitignore | 43 -- src/MvcPrecompilation/Directory.Build.props | 20 - src/MvcPrecompilation/Directory.Build.targets | 7 - .../NuGetPackageVerifier.json | 21 - .../RazorViewCompilation.sln | 327 ---------- src/MvcPrecompilation/build/Key.snk | Bin 596 -> 0 bytes .../build/dependencies.props | 39 -- src/MvcPrecompilation/build/repo.props | 8 - src/MvcPrecompilation/build/sources.props | 17 - .../src/Directory.Build.props | 7 - ...ore.Mvc.Razor.ViewCompilation.Tasks.csproj | 15 - .../test/Directory.Build.props | 11 - .../FunctionalTests/FunctionalTests.csproj | 50 -- .../ApplicationUsingRelativePaths.csproj | 16 - .../ApplicationWithConfigureMvc.csproj | 17 - .../ApplicationWithCustomInputFiles.csproj | 21 - .../ApplicationWithParseErrors.csproj | 16 - .../ApplicationWithRazorSdkNeitherUsed.csproj | 20 - ...ationWithRazorSdkPrecompilationUsed.csproj | 20 - .../ApplicationWithRazorSdkUsed.csproj | 15 - .../ApplicationWithTagHelpers.csproj | 20 - .../PublishWithEmbedViewSources.csproj | 17 - .../RazorPagesApp/RazorPagesApp.csproj | 17 - .../testapps/SimpleApp/SimpleApp.csproj | 17 - .../SimpleAppWithAssemblyRename.csproj | 17 - .../StrongNamedApp/StrongNamedApp.csproj | 18 - src/MvcPrecompilation/version.props | 12 - 180 files changed, 912 insertions(+), 836 deletions(-) rename src/{MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tasks => Mvc/ViewCompilation.Tasks}/GetDotNetHost.cs (100%) create mode 100644 src/Mvc/ViewCompilation.Tasks/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tasks.csproj rename src/{MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation => Mvc/ViewCompilation/src}/Internal/AssemblyMetadataGenerator.cs (100%) rename src/{MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation => Mvc/ViewCompilation/src}/Internal/CompilationOptions.cs (100%) rename src/{MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation => Mvc/ViewCompilation/src}/Internal/DebugHelper.cs (100%) rename src/{MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation => Mvc/ViewCompilation/src}/Internal/MvcServiceProvider.cs (100%) rename src/{MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation => Mvc/ViewCompilation/src}/Internal/PrecompilationApplication.cs (100%) rename src/{MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation => Mvc/ViewCompilation/src}/Internal/PrecompileRunCommand.cs (100%) rename src/{MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation => Mvc/ViewCompilation/src}/Internal/SnkUtils.cs (100%) rename src/{MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation => Mvc/ViewCompilation/src}/Internal/ViewCompilationInfo.cs (100%) rename src/{MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation => Mvc/ViewCompilation/src}/Internal/ViewFileInfo.cs (100%) rename src/{MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation => Mvc/ViewCompilation/src}/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.csproj (83%) rename src/{MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation => Mvc/ViewCompilation/src}/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.nuspec (100%) rename src/{MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation => Mvc/ViewCompilation/src}/Program.cs (100%) rename src/{MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation => Mvc/ViewCompilation/src}/Properties/AssemblyInfo.cs (100%) rename src/{MvcPrecompilation => Mvc/ViewCompilation/src}/README.md (79%) rename src/{MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation => Mvc/ViewCompilation/src}/baseline.netcore.json (100%) rename src/{MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation => Mvc/ViewCompilation/src}/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.targets (100%) rename src/{MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation => Mvc/ViewCompilation/src}/lib/net461/_._ (100%) rename src/{MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation => Mvc/ViewCompilation/src}/lib/netcoreapp2.0/_._ (100%) rename src/{MvcPrecompilation => Mvc/ViewCompilation}/test/FunctionalTests/CoreCLRTests/CoreCLRApplicationTestFixture.cs (100%) rename src/{MvcPrecompilation => Mvc/ViewCompilation}/test/FunctionalTests/CoreCLRTests/SimpleAppTest_CoreCLR.cs (100%) rename src/{MvcPrecompilation => Mvc/ViewCompilation}/test/FunctionalTests/DesktopTests/DesktopApplicationTestFixture.cs (100%) rename src/{MvcPrecompilation => Mvc/ViewCompilation}/test/FunctionalTests/DesktopTests/SimpleAppTest_Desktop.cs (92%) rename src/{MvcPrecompilation => Mvc/ViewCompilation}/test/FunctionalTests/Infrastructure/ApplicationPaths.cs (81%) rename src/{MvcPrecompilation => Mvc/ViewCompilation}/test/FunctionalTests/Infrastructure/ApplicationTestFixture.cs (100%) rename src/{MvcPrecompilation => Mvc/ViewCompilation}/test/FunctionalTests/Infrastructure/HttpClientExtensions.cs (100%) rename src/{MvcPrecompilation => Mvc/ViewCompilation}/test/FunctionalTests/Infrastructure/PublishOnlyDeployer.cs (100%) rename src/{MvcPrecompilation => Mvc/ViewCompilation}/test/FunctionalTests/Infrastructure/TestEmbeddedResource.cs (100%) create mode 100644 src/Mvc/ViewCompilation/test/FunctionalTests/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.FunctionalTests.csproj rename src/{MvcPrecompilation => Mvc/ViewCompilation}/test/FunctionalTests/Properties/AssemblyInfo.cs (100%) rename src/{MvcPrecompilation => Mvc/ViewCompilation}/test/FunctionalTests/Resources/SimpleAppTest.Home.Index.txt (100%) rename src/{MvcPrecompilation/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test => Mvc/ViewCompilation/test/UnitTests}/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test.csproj (55%) rename src/{MvcPrecompilation/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test => Mvc/ViewCompilation/test/UnitTests}/PrecompileRunCommandTest.cs (100%) create mode 100644 src/Mvc/ViewCompilation/testassets/ApplicationUsingRelativePaths/ApplicationUsingRelativePaths.csproj rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/ApplicationUsingRelativePaths/Controllers/HomeController.cs (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/ApplicationUsingRelativePaths/Program.cs (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/ApplicationUsingRelativePaths/Startup.cs (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/ApplicationUsingRelativePaths/Views/Home/About.cshtml (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/ApplicationUsingRelativePaths/Views/Home/Index.cshtml (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/ApplicationUsingRelativePaths/Views/Shared/_Layout.cshtml (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/ApplicationUsingRelativePaths/Views/_ViewImports.cshtml (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/ApplicationUsingRelativePaths/Views/_ViewStart.cshtml (100%) create mode 100644 src/Mvc/ViewCompilation/testassets/ApplicationWithConfigureMvc/ApplicationWithConfigureMvc.csproj rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/ApplicationWithConfigureMvc/Controllers/HomeController.cs (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/ApplicationWithConfigureMvc/Program.cs (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/ApplicationWithConfigureMvc/RazorRewriter.cs (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/ApplicationWithConfigureMvc/Startup.cs (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/ApplicationWithConfigureMvc/Views/Home/Index.cshtml (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/ApplicationWithConfigureMvc/Views/Home/ViewWithPreprocessor.cshtml (100%) create mode 100644 src/Mvc/ViewCompilation/testassets/ApplicationWithCustomInputFiles/ApplicationWithCustomInputFiles.csproj rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/ApplicationWithCustomInputFiles/Controllers/HomeController.cs (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/ApplicationWithCustomInputFiles/Program.cs (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/ApplicationWithCustomInputFiles/Startup.cs (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/ApplicationWithCustomInputFiles/Views/Home/About.cshtml (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/ApplicationWithCustomInputFiles/Views/Home/Index.cshtml (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/ApplicationWithCustomInputFiles/Views/Home/NotIncluded.cshtml (100%) create mode 100644 src/Mvc/ViewCompilation/testassets/ApplicationWithParseErrors/ApplicationWithParseErrors.csproj rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/ApplicationWithParseErrors/Program.cs (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/ApplicationWithParseErrors/Startup.cs (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/ApplicationWithParseErrors/Views/Home/About.cshtml (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/ApplicationWithParseErrors/Views/Home/Index.cshtml (100%) create mode 100644 src/Mvc/ViewCompilation/testassets/ApplicationWithRazorSdkNeitherUsed/ApplicationWithRazorSdkNeitherUsed.csproj rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/ApplicationWithRazorSdkNeitherUsed/Controllers/HomeController.cs (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/ApplicationWithRazorSdkNeitherUsed/Program.cs (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/ApplicationWithRazorSdkNeitherUsed/Startup.cs (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/ApplicationWithRazorSdkNeitherUsed/Views/Home/About.cshtml (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/ApplicationWithRazorSdkNeitherUsed/Views/Home/Index.cshtml (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/ApplicationWithRazorSdkNeitherUsed/Views/Shared/_Layout.cshtml (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/ApplicationWithRazorSdkNeitherUsed/Views/_ViewImports.cshtml (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/ApplicationWithRazorSdkNeitherUsed/Views/_ViewStart.cshtml (100%) create mode 100644 src/Mvc/ViewCompilation/testassets/ApplicationWithRazorSdkPrecompilationUsed/ApplicationWithRazorSdkPrecompilationUsed.csproj rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/ApplicationWithRazorSdkPrecompilationUsed/Controllers/HomeController.cs (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/ApplicationWithRazorSdkPrecompilationUsed/Program.cs (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/ApplicationWithRazorSdkPrecompilationUsed/Startup.cs (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/ApplicationWithRazorSdkPrecompilationUsed/Views/Home/About.cshtml (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/ApplicationWithRazorSdkPrecompilationUsed/Views/Home/Index.cshtml (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/ApplicationWithRazorSdkPrecompilationUsed/Views/Shared/_Layout.cshtml (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/ApplicationWithRazorSdkPrecompilationUsed/Views/_ViewImports.cshtml (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/ApplicationWithRazorSdkPrecompilationUsed/Views/_ViewStart.cshtml (100%) create mode 100644 src/Mvc/ViewCompilation/testassets/ApplicationWithRazorSdkUsed/ApplicationWithRazorSdkUsed.csproj rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/ApplicationWithRazorSdkUsed/Controllers/HomeController.cs (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/ApplicationWithRazorSdkUsed/Program.cs (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/ApplicationWithRazorSdkUsed/Startup.cs (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/ApplicationWithRazorSdkUsed/Views/Home/About.cshtml (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/ApplicationWithRazorSdkUsed/Views/Home/Index.cshtml (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/ApplicationWithRazorSdkUsed/Views/Shared/_Layout.cshtml (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/ApplicationWithRazorSdkUsed/Views/_ViewImports.cshtml (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/ApplicationWithRazorSdkUsed/Views/_ViewStart.cshtml (100%) create mode 100644 src/Mvc/ViewCompilation/testassets/ApplicationWithTagHelpers/ApplicationWithTagHelpers.csproj rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/ApplicationWithTagHelpers/Components/CopyrightViewComponent.cs (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/ApplicationWithTagHelpers/Controllers/HomeController.cs (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/ApplicationWithTagHelpers/Program.cs (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/ApplicationWithTagHelpers/Startup.cs (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/ApplicationWithTagHelpers/TagHelpers/TestTagHelper.cs (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/ApplicationWithTagHelpers/Views/Home/ClassLibraryTagHelper.cshtml (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/ApplicationWithTagHelpers/Views/Home/LocalTagHelper.cshtml (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/ApplicationWithTagHelpers/Views/Shared/Components/Copyright/Default.cshtml (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/ApplicationWithTagHelpers/Views/Shared/_Layout.cshtml (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/ApplicationWithTagHelpers/Views/_ViewImports.cshtml (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/ApplicationWithTagHelpers/Views/_ViewStart.cshtml (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/ClassLibraryTagHelper/BoldTagHelper.cs (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/ClassLibraryTagHelper/ClassLibraryTagHelper.csproj (57%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/Directory.Build.props (65%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/Directory.Build.targets (51%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/PublishWithEmbedViewSources/Areas/TestArea/Views/Home/Index.cshtml (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/PublishWithEmbedViewSources/Controllers/HomeController.cs (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/PublishWithEmbedViewSources/Program.cs (100%) create mode 100644 src/Mvc/ViewCompilation/testassets/PublishWithEmbedViewSources/PublishWithEmbedViewSources.csproj rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/PublishWithEmbedViewSources/Startup.cs (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/PublishWithEmbedViewSources/Views/Home/About.cshtml (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/PublishWithEmbedViewSources/Views/Home/Index.cshtml (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/RazorPagesApp/Pages/Auth/Index.cshtml (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/RazorPagesApp/Pages/Index.cshtml (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/RazorPagesApp/Pages/Login.cshtml (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/RazorPagesApp/Pages/MyPageModel.cs (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/RazorPagesApp/Pages/Nested1/Nested2/PageWithTagHelper.cshtml (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/RazorPagesApp/Pages/Nested1/_ViewImports.cshtml (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/RazorPagesApp/Pages/PageWithModel.cshtml (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/RazorPagesApp/Pages/PageWithRoute.cshtml (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/RazorPagesApp/Pages/_PageStart.cshtml (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/RazorPagesApp/Pages/_ViewImports.cshtml (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/RazorPagesApp/Program.cs (100%) create mode 100644 src/Mvc/ViewCompilation/testassets/RazorPagesApp/RazorPagesApp.csproj rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/RazorPagesApp/Startup.cs (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/RazorPagesApp/Views/Shared/_Layout.cshtml (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/SimpleApp/Controllers/HomeController.cs (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/SimpleApp/Program.cs (100%) create mode 100644 src/Mvc/ViewCompilation/testassets/SimpleApp/SimpleApp.csproj rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/SimpleApp/Startup.cs (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/SimpleApp/Views/Home/About.cshtml (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/SimpleApp/Views/Home/Index.cshtml (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/SimpleApp/Views/Shared/_Layout.cshtml (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/SimpleApp/Views/_ViewImports.cshtml (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/SimpleApp/Views/_ViewStart.cshtml (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/SimpleAppWithAssemblyRename/Controllers/HomeController.cs (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/SimpleAppWithAssemblyRename/Program.cs (100%) create mode 100644 src/Mvc/ViewCompilation/testassets/SimpleAppWithAssemblyRename/SimpleAppWithAssemblyRename.csproj rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/SimpleAppWithAssemblyRename/Startup.cs (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/SimpleAppWithAssemblyRename/Views/Home/Index.cshtml (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/SimpleAppWithAssemblyRename/Views/_ViewImports.cshtml (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/StrongNamedApp/Controllers/HomeController.cs (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/StrongNamedApp/Program.cs (100%) rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/StrongNamedApp/Startup.cs (100%) create mode 100644 src/Mvc/ViewCompilation/testassets/StrongNamedApp/StrongNamedApp.csproj rename src/{MvcPrecompilation/testapps => Mvc/ViewCompilation/testassets}/StrongNamedApp/Views/Home/Index.cshtml (100%) delete mode 100644 src/MvcPrecompilation/.gitignore delete mode 100644 src/MvcPrecompilation/Directory.Build.props delete mode 100644 src/MvcPrecompilation/Directory.Build.targets delete mode 100644 src/MvcPrecompilation/NuGetPackageVerifier.json delete mode 100644 src/MvcPrecompilation/RazorViewCompilation.sln delete mode 100644 src/MvcPrecompilation/build/Key.snk delete mode 100644 src/MvcPrecompilation/build/dependencies.props delete mode 100644 src/MvcPrecompilation/build/repo.props delete mode 100644 src/MvcPrecompilation/build/sources.props delete mode 100644 src/MvcPrecompilation/src/Directory.Build.props delete mode 100644 src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tasks/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tasks.csproj delete mode 100644 src/MvcPrecompilation/test/Directory.Build.props delete mode 100644 src/MvcPrecompilation/test/FunctionalTests/FunctionalTests.csproj delete mode 100644 src/MvcPrecompilation/testapps/ApplicationUsingRelativePaths/ApplicationUsingRelativePaths.csproj delete mode 100644 src/MvcPrecompilation/testapps/ApplicationWithConfigureMvc/ApplicationWithConfigureMvc.csproj delete mode 100644 src/MvcPrecompilation/testapps/ApplicationWithCustomInputFiles/ApplicationWithCustomInputFiles.csproj delete mode 100644 src/MvcPrecompilation/testapps/ApplicationWithParseErrors/ApplicationWithParseErrors.csproj delete mode 100644 src/MvcPrecompilation/testapps/ApplicationWithRazorSdkNeitherUsed/ApplicationWithRazorSdkNeitherUsed.csproj delete mode 100644 src/MvcPrecompilation/testapps/ApplicationWithRazorSdkPrecompilationUsed/ApplicationWithRazorSdkPrecompilationUsed.csproj delete mode 100644 src/MvcPrecompilation/testapps/ApplicationWithRazorSdkUsed/ApplicationWithRazorSdkUsed.csproj delete mode 100644 src/MvcPrecompilation/testapps/ApplicationWithTagHelpers/ApplicationWithTagHelpers.csproj delete mode 100644 src/MvcPrecompilation/testapps/PublishWithEmbedViewSources/PublishWithEmbedViewSources.csproj delete mode 100644 src/MvcPrecompilation/testapps/RazorPagesApp/RazorPagesApp.csproj delete mode 100644 src/MvcPrecompilation/testapps/SimpleApp/SimpleApp.csproj delete mode 100644 src/MvcPrecompilation/testapps/SimpleAppWithAssemblyRename/SimpleAppWithAssemblyRename.csproj delete mode 100644 src/MvcPrecompilation/testapps/StrongNamedApp/StrongNamedApp.csproj delete mode 100644 src/MvcPrecompilation/version.props diff --git a/build/buildorder.props b/build/buildorder.props index 095d895465..fc8d980067 100644 --- a/build/buildorder.props +++ b/build/buildorder.props @@ -8,7 +8,6 @@ - diff --git a/build/submodules.props b/build/submodules.props index f7fff91843..254c4426a7 100644 --- a/build/submodules.props +++ b/build/submodules.props @@ -45,6 +45,5 @@ - diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index 0f5803e0f2..6aee6d0279 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -713,6 +713,18 @@ + + + 2.1.1 + + + + + + + + + 2.1.3 diff --git a/eng/Baseline.xml b/eng/Baseline.xml index 30847a3c33..bcbfb54292 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -78,6 +78,7 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch. + diff --git a/eng/Dependencies.props b/eng/Dependencies.props index 42d66d41a8..e98d42be14 100644 --- a/eng/Dependencies.props +++ b/eng/Dependencies.props @@ -27,6 +27,7 @@ and are generated based on the last package release. + diff --git a/eng/ProjectReferences.props b/eng/ProjectReferences.props index a3d3857bb1..3147f6a65a 100644 --- a/eng/ProjectReferences.props +++ b/eng/ProjectReferences.props @@ -119,6 +119,7 @@ + diff --git a/src/Mvc/Mvc.sln b/src/Mvc/Mvc.sln index da45132198..fdd07b6e87 100644 --- a/src/Mvc/Mvc.sln +++ b/src/Mvc/Mvc.sln @@ -170,6 +170,88 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.An EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RazorPagesClassLibrary", "test\WebSites\RazorPagesClassLibrary\RazorPagesClassLibrary.csproj", "{17122147-ADFD-41C8-87D9-CCC582CCA8F9}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_dependencies", "_dependencies", "{5FE3048A-E96B-44F8-A7C4-FC590D7E04B4}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Html.Abstractions", "..\Html\Abstractions\src\Microsoft.AspNetCore.Html.Abstractions.csproj", "{0930C2EA-FA36-4EDF-A571-215765D1F2C7}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Http", "..\Http\Http\src\Microsoft.AspNetCore.Http.csproj", "{A273BAAB-DA92-401D-B781-ADA9E3B7717C}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Cors", "..\Middleware\CORS\src\Microsoft.AspNetCore.Cors.csproj", "{E07B7D3A-1D4D-4644-84C2-06FEDB64885B}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Hosting", "..\Hosting\Hosting\src\Microsoft.AspNetCore.Hosting.csproj", "{0F5F9381-D3B4-4E0D-9FAA-CC12520DBB4A}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.TestHost", "..\Hosting\TestHost\src\Microsoft.AspNetCore.TestHost.csproj", "{2E18C4FD-9982-4BD9-A067-3CE56E68C450}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Diagnostics", "..\Middleware\Diagnostics\src\Microsoft.AspNetCore.Diagnostics.csproj", "{C79D9793-FADA-4B1A-8AD7-8AEDB2358CA2}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IntegrationTesting", "..\Hosting\Server.IntegrationTesting\src\Microsoft.AspNetCore.Server.IntegrationTesting.csproj", "{BCD18147-D96D-4240-A89F-5F890392E58E}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.WebUtilities", "..\Http\WebUtilities\src\Microsoft.AspNetCore.WebUtilities.csproj", "{986BF4FD-D0E3-48AE-917C-6C168D6395D3}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.ResponseCaching", "..\Middleware\ResponseCaching\src\Microsoft.AspNetCore.ResponseCaching.csproj", "{F4E1F1ED-2DE9-4659-B2E7-C9B6B8454AD1}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.StaticFiles", "..\Middleware\StaticFiles\src\Microsoft.AspNetCore.StaticFiles.csproj", "{F4846AC2-384E-4C0B-8DE5-9784715E4A9F}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Session", "..\Middleware\Session\src\Microsoft.AspNetCore.Session.csproj", "{C019C7EC-FDEE-4EAF-ABF1-89D946EFC95A}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Localization.Routing", "..\Middleware\Localization.Routing\src\Microsoft.AspNetCore.Localization.Routing.csproj", "{68C9E09E-F7FA-4853-B512-6BCD02BB69C1}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Runtime", "..\Razor\Razor.Runtime\src\Microsoft.AspNetCore.Razor.Runtime.csproj", "{9F2C52EA-1869-4610-921F-5FD654582019}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.Cookies", "..\Security\Authentication\Cookies\src\Microsoft.AspNetCore.Authentication.Cookies.csproj", "{AA074523-64D3-4CA7-8C2E-EACD977D2B19}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.NET.Sdk.Razor", "..\Razor\Sdk.Razor\src\Microsoft.NET.Sdk.Razor.csproj", "{5145333A-40F8-4754-BA47-EC1CCECBE986}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration", "..\Servers\IIS\IISIntegration\src\Microsoft.AspNetCore.Server.IISIntegration.csproj", "{47D5BF2A-7B05-4630-8C7C-A682382EA6F1}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication", "..\Security\Authentication\Core\src\Microsoft.AspNetCore.Authentication.csproj", "{72D40CFE-93B5-4877-92DC-E79203641342}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel", "..\Servers\Kestrel\Kestrel\src\Microsoft.AspNetCore.Server.Kestrel.csproj", "{62952E87-88DB-45BA-9FE0-8A24FA983750}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.CookiePolicy", "..\Security\CookiePolicy\src\Microsoft.AspNetCore.CookiePolicy.csproj", "{F4879FAE-CD3C-4158-9BF0-B8D9294CCD0D}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authorization.Policy", "..\Security\Authorization\Policy\src\Microsoft.AspNetCore.Authorization.Policy.csproj", "{157F16EA-C5C1-4BDF-A81C-44A7771A13D7}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ViewCompilation", "ViewCompilation", "{83D016A9-7233-43FC-94C1-0AF2619D136B}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "testAssets", "testAssets", "{5C8A337A-956B-4045-A680-4A61942D0866}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Razor.ViewCompilation", "ViewCompilation\src\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.csproj", "{99BB0544-6AA4-4787-B396-0AE77D022547}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tasks", "ViewCompilation.Tasks\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tasks.csproj", "{0BB79FE3-F376-4352-97B3-382F7FFDDBE9}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test", "ViewCompilation\test\UnitTests\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test.csproj", "{4A300DA7-A19B-459D-96CA-C999B2CCABFD}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationUsingRelativePaths", "ViewCompilation\testassets\ApplicationUsingRelativePaths\ApplicationUsingRelativePaths.csproj", "{53663DBF-D7FF-4BBF-8211-909237616049}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationWithConfigureMvc", "ViewCompilation\testassets\ApplicationWithConfigureMvc\ApplicationWithConfigureMvc.csproj", "{134CDB3F-76CF-44D8-9621-F865092ACF20}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationWithCustomInputFiles", "ViewCompilation\testassets\ApplicationWithCustomInputFiles\ApplicationWithCustomInputFiles.csproj", "{23F77F9B-2979-4DF0-9096-C090CE7BE09D}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationWithParseErrors", "ViewCompilation\testassets\ApplicationWithParseErrors\ApplicationWithParseErrors.csproj", "{B079D8A1-6CC1-46D8-948A-523AA6836FF9}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationWithRazorSdkNeitherUsed", "ViewCompilation\testassets\ApplicationWithRazorSdkNeitherUsed\ApplicationWithRazorSdkNeitherUsed.csproj", "{7CD48059-3ACF-4435-B6D5-F4F4B379F8B1}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationWithRazorSdkPrecompilationUsed", "ViewCompilation\testassets\ApplicationWithRazorSdkPrecompilationUsed\ApplicationWithRazorSdkPrecompilationUsed.csproj", "{21C75A50-991B-44D2-B684-732733969C23}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationWithRazorSdkUsed", "ViewCompilation\testassets\ApplicationWithRazorSdkUsed\ApplicationWithRazorSdkUsed.csproj", "{92A8AB5D-4BA1-43B4-A769-62DCDEFEB04C}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationWithTagHelpers", "ViewCompilation\testassets\ApplicationWithTagHelpers\ApplicationWithTagHelpers.csproj", "{ABF8187A-F6FF-4722-B625-897B385F6CEC}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClassLibraryTagHelper", "ViewCompilation\testassets\ClassLibraryTagHelper\ClassLibraryTagHelper.csproj", "{6EFC8D17-47E9-44F7-897E-4F1102B16DF4}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PublishWithEmbedViewSources", "ViewCompilation\testassets\PublishWithEmbedViewSources\PublishWithEmbedViewSources.csproj", "{B2624173-3535-4138-9F90-420D83772ABC}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RazorPagesApp", "ViewCompilation\testassets\RazorPagesApp\RazorPagesApp.csproj", "{1403D49E-C3DB-49E8-A888-541F0C8F9DCD}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleApp", "ViewCompilation\testassets\SimpleApp\SimpleApp.csproj", "{36C62FC6-8496-492D-A2F9-BF68CC6520BB}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleAppWithAssemblyRename", "ViewCompilation\testassets\SimpleAppWithAssemblyRename\SimpleAppWithAssemblyRename.csproj", "{D54A8DCC-801E-4407-A9CC-01E4C33A72EB}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StrongNamedApp", "ViewCompilation\testassets\StrongNamedApp\StrongNamedApp.csproj", "{13CB4F98-F361-4989-BBC2-0B0ECDAC68F3}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.FunctionalTests", "ViewCompilation\test\FunctionalTests\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.FunctionalTests.csproj", "{0A2B5ED2-E9A7-41A5-9B0F-10007673F2D9}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -892,6 +974,462 @@ Global {17122147-ADFD-41C8-87D9-CCC582CCA8F9}.Release|Mixed Platforms.Build.0 = Release|Any CPU {17122147-ADFD-41C8-87D9-CCC582CCA8F9}.Release|x86.ActiveCfg = Release|Any CPU {17122147-ADFD-41C8-87D9-CCC582CCA8F9}.Release|x86.Build.0 = Release|Any CPU + {0930C2EA-FA36-4EDF-A571-215765D1F2C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0930C2EA-FA36-4EDF-A571-215765D1F2C7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0930C2EA-FA36-4EDF-A571-215765D1F2C7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {0930C2EA-FA36-4EDF-A571-215765D1F2C7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {0930C2EA-FA36-4EDF-A571-215765D1F2C7}.Debug|x86.ActiveCfg = Debug|Any CPU + {0930C2EA-FA36-4EDF-A571-215765D1F2C7}.Debug|x86.Build.0 = Debug|Any CPU + {0930C2EA-FA36-4EDF-A571-215765D1F2C7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0930C2EA-FA36-4EDF-A571-215765D1F2C7}.Release|Any CPU.Build.0 = Release|Any CPU + {0930C2EA-FA36-4EDF-A571-215765D1F2C7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {0930C2EA-FA36-4EDF-A571-215765D1F2C7}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {0930C2EA-FA36-4EDF-A571-215765D1F2C7}.Release|x86.ActiveCfg = Release|Any CPU + {0930C2EA-FA36-4EDF-A571-215765D1F2C7}.Release|x86.Build.0 = Release|Any CPU + {A273BAAB-DA92-401D-B781-ADA9E3B7717C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A273BAAB-DA92-401D-B781-ADA9E3B7717C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A273BAAB-DA92-401D-B781-ADA9E3B7717C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {A273BAAB-DA92-401D-B781-ADA9E3B7717C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {A273BAAB-DA92-401D-B781-ADA9E3B7717C}.Debug|x86.ActiveCfg = Debug|Any CPU + {A273BAAB-DA92-401D-B781-ADA9E3B7717C}.Debug|x86.Build.0 = Debug|Any CPU + {A273BAAB-DA92-401D-B781-ADA9E3B7717C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A273BAAB-DA92-401D-B781-ADA9E3B7717C}.Release|Any CPU.Build.0 = Release|Any CPU + {A273BAAB-DA92-401D-B781-ADA9E3B7717C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {A273BAAB-DA92-401D-B781-ADA9E3B7717C}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {A273BAAB-DA92-401D-B781-ADA9E3B7717C}.Release|x86.ActiveCfg = Release|Any CPU + {A273BAAB-DA92-401D-B781-ADA9E3B7717C}.Release|x86.Build.0 = Release|Any CPU + {E07B7D3A-1D4D-4644-84C2-06FEDB64885B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E07B7D3A-1D4D-4644-84C2-06FEDB64885B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E07B7D3A-1D4D-4644-84C2-06FEDB64885B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {E07B7D3A-1D4D-4644-84C2-06FEDB64885B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {E07B7D3A-1D4D-4644-84C2-06FEDB64885B}.Debug|x86.ActiveCfg = Debug|Any CPU + {E07B7D3A-1D4D-4644-84C2-06FEDB64885B}.Debug|x86.Build.0 = Debug|Any CPU + {E07B7D3A-1D4D-4644-84C2-06FEDB64885B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E07B7D3A-1D4D-4644-84C2-06FEDB64885B}.Release|Any CPU.Build.0 = Release|Any CPU + {E07B7D3A-1D4D-4644-84C2-06FEDB64885B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {E07B7D3A-1D4D-4644-84C2-06FEDB64885B}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {E07B7D3A-1D4D-4644-84C2-06FEDB64885B}.Release|x86.ActiveCfg = Release|Any CPU + {E07B7D3A-1D4D-4644-84C2-06FEDB64885B}.Release|x86.Build.0 = Release|Any CPU + {0F5F9381-D3B4-4E0D-9FAA-CC12520DBB4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0F5F9381-D3B4-4E0D-9FAA-CC12520DBB4A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0F5F9381-D3B4-4E0D-9FAA-CC12520DBB4A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {0F5F9381-D3B4-4E0D-9FAA-CC12520DBB4A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {0F5F9381-D3B4-4E0D-9FAA-CC12520DBB4A}.Debug|x86.ActiveCfg = Debug|Any CPU + {0F5F9381-D3B4-4E0D-9FAA-CC12520DBB4A}.Debug|x86.Build.0 = Debug|Any CPU + {0F5F9381-D3B4-4E0D-9FAA-CC12520DBB4A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0F5F9381-D3B4-4E0D-9FAA-CC12520DBB4A}.Release|Any CPU.Build.0 = Release|Any CPU + {0F5F9381-D3B4-4E0D-9FAA-CC12520DBB4A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {0F5F9381-D3B4-4E0D-9FAA-CC12520DBB4A}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {0F5F9381-D3B4-4E0D-9FAA-CC12520DBB4A}.Release|x86.ActiveCfg = Release|Any CPU + {0F5F9381-D3B4-4E0D-9FAA-CC12520DBB4A}.Release|x86.Build.0 = Release|Any CPU + {2E18C4FD-9982-4BD9-A067-3CE56E68C450}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2E18C4FD-9982-4BD9-A067-3CE56E68C450}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2E18C4FD-9982-4BD9-A067-3CE56E68C450}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {2E18C4FD-9982-4BD9-A067-3CE56E68C450}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {2E18C4FD-9982-4BD9-A067-3CE56E68C450}.Debug|x86.ActiveCfg = Debug|Any CPU + {2E18C4FD-9982-4BD9-A067-3CE56E68C450}.Debug|x86.Build.0 = Debug|Any CPU + {2E18C4FD-9982-4BD9-A067-3CE56E68C450}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2E18C4FD-9982-4BD9-A067-3CE56E68C450}.Release|Any CPU.Build.0 = Release|Any CPU + {2E18C4FD-9982-4BD9-A067-3CE56E68C450}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {2E18C4FD-9982-4BD9-A067-3CE56E68C450}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {2E18C4FD-9982-4BD9-A067-3CE56E68C450}.Release|x86.ActiveCfg = Release|Any CPU + {2E18C4FD-9982-4BD9-A067-3CE56E68C450}.Release|x86.Build.0 = Release|Any CPU + {C79D9793-FADA-4B1A-8AD7-8AEDB2358CA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C79D9793-FADA-4B1A-8AD7-8AEDB2358CA2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C79D9793-FADA-4B1A-8AD7-8AEDB2358CA2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {C79D9793-FADA-4B1A-8AD7-8AEDB2358CA2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {C79D9793-FADA-4B1A-8AD7-8AEDB2358CA2}.Debug|x86.ActiveCfg = Debug|Any CPU + {C79D9793-FADA-4B1A-8AD7-8AEDB2358CA2}.Debug|x86.Build.0 = Debug|Any CPU + {C79D9793-FADA-4B1A-8AD7-8AEDB2358CA2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C79D9793-FADA-4B1A-8AD7-8AEDB2358CA2}.Release|Any CPU.Build.0 = Release|Any CPU + {C79D9793-FADA-4B1A-8AD7-8AEDB2358CA2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {C79D9793-FADA-4B1A-8AD7-8AEDB2358CA2}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {C79D9793-FADA-4B1A-8AD7-8AEDB2358CA2}.Release|x86.ActiveCfg = Release|Any CPU + {C79D9793-FADA-4B1A-8AD7-8AEDB2358CA2}.Release|x86.Build.0 = Release|Any CPU + {BCD18147-D96D-4240-A89F-5F890392E58E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BCD18147-D96D-4240-A89F-5F890392E58E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BCD18147-D96D-4240-A89F-5F890392E58E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {BCD18147-D96D-4240-A89F-5F890392E58E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {BCD18147-D96D-4240-A89F-5F890392E58E}.Debug|x86.ActiveCfg = Debug|Any CPU + {BCD18147-D96D-4240-A89F-5F890392E58E}.Debug|x86.Build.0 = Debug|Any CPU + {BCD18147-D96D-4240-A89F-5F890392E58E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BCD18147-D96D-4240-A89F-5F890392E58E}.Release|Any CPU.Build.0 = Release|Any CPU + {BCD18147-D96D-4240-A89F-5F890392E58E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {BCD18147-D96D-4240-A89F-5F890392E58E}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {BCD18147-D96D-4240-A89F-5F890392E58E}.Release|x86.ActiveCfg = Release|Any CPU + {BCD18147-D96D-4240-A89F-5F890392E58E}.Release|x86.Build.0 = Release|Any CPU + {986BF4FD-D0E3-48AE-917C-6C168D6395D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {986BF4FD-D0E3-48AE-917C-6C168D6395D3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {986BF4FD-D0E3-48AE-917C-6C168D6395D3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {986BF4FD-D0E3-48AE-917C-6C168D6395D3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {986BF4FD-D0E3-48AE-917C-6C168D6395D3}.Debug|x86.ActiveCfg = Debug|Any CPU + {986BF4FD-D0E3-48AE-917C-6C168D6395D3}.Debug|x86.Build.0 = Debug|Any CPU + {986BF4FD-D0E3-48AE-917C-6C168D6395D3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {986BF4FD-D0E3-48AE-917C-6C168D6395D3}.Release|Any CPU.Build.0 = Release|Any CPU + {986BF4FD-D0E3-48AE-917C-6C168D6395D3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {986BF4FD-D0E3-48AE-917C-6C168D6395D3}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {986BF4FD-D0E3-48AE-917C-6C168D6395D3}.Release|x86.ActiveCfg = Release|Any CPU + {986BF4FD-D0E3-48AE-917C-6C168D6395D3}.Release|x86.Build.0 = Release|Any CPU + {F4E1F1ED-2DE9-4659-B2E7-C9B6B8454AD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F4E1F1ED-2DE9-4659-B2E7-C9B6B8454AD1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F4E1F1ED-2DE9-4659-B2E7-C9B6B8454AD1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {F4E1F1ED-2DE9-4659-B2E7-C9B6B8454AD1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {F4E1F1ED-2DE9-4659-B2E7-C9B6B8454AD1}.Debug|x86.ActiveCfg = Debug|Any CPU + {F4E1F1ED-2DE9-4659-B2E7-C9B6B8454AD1}.Debug|x86.Build.0 = Debug|Any CPU + {F4E1F1ED-2DE9-4659-B2E7-C9B6B8454AD1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F4E1F1ED-2DE9-4659-B2E7-C9B6B8454AD1}.Release|Any CPU.Build.0 = Release|Any CPU + {F4E1F1ED-2DE9-4659-B2E7-C9B6B8454AD1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {F4E1F1ED-2DE9-4659-B2E7-C9B6B8454AD1}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {F4E1F1ED-2DE9-4659-B2E7-C9B6B8454AD1}.Release|x86.ActiveCfg = Release|Any CPU + {F4E1F1ED-2DE9-4659-B2E7-C9B6B8454AD1}.Release|x86.Build.0 = Release|Any CPU + {F4846AC2-384E-4C0B-8DE5-9784715E4A9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F4846AC2-384E-4C0B-8DE5-9784715E4A9F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F4846AC2-384E-4C0B-8DE5-9784715E4A9F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {F4846AC2-384E-4C0B-8DE5-9784715E4A9F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {F4846AC2-384E-4C0B-8DE5-9784715E4A9F}.Debug|x86.ActiveCfg = Debug|Any CPU + {F4846AC2-384E-4C0B-8DE5-9784715E4A9F}.Debug|x86.Build.0 = Debug|Any CPU + {F4846AC2-384E-4C0B-8DE5-9784715E4A9F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F4846AC2-384E-4C0B-8DE5-9784715E4A9F}.Release|Any CPU.Build.0 = Release|Any CPU + {F4846AC2-384E-4C0B-8DE5-9784715E4A9F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {F4846AC2-384E-4C0B-8DE5-9784715E4A9F}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {F4846AC2-384E-4C0B-8DE5-9784715E4A9F}.Release|x86.ActiveCfg = Release|Any CPU + {F4846AC2-384E-4C0B-8DE5-9784715E4A9F}.Release|x86.Build.0 = Release|Any CPU + {C019C7EC-FDEE-4EAF-ABF1-89D946EFC95A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C019C7EC-FDEE-4EAF-ABF1-89D946EFC95A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C019C7EC-FDEE-4EAF-ABF1-89D946EFC95A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {C019C7EC-FDEE-4EAF-ABF1-89D946EFC95A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {C019C7EC-FDEE-4EAF-ABF1-89D946EFC95A}.Debug|x86.ActiveCfg = Debug|Any CPU + {C019C7EC-FDEE-4EAF-ABF1-89D946EFC95A}.Debug|x86.Build.0 = Debug|Any CPU + {C019C7EC-FDEE-4EAF-ABF1-89D946EFC95A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C019C7EC-FDEE-4EAF-ABF1-89D946EFC95A}.Release|Any CPU.Build.0 = Release|Any CPU + {C019C7EC-FDEE-4EAF-ABF1-89D946EFC95A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {C019C7EC-FDEE-4EAF-ABF1-89D946EFC95A}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {C019C7EC-FDEE-4EAF-ABF1-89D946EFC95A}.Release|x86.ActiveCfg = Release|Any CPU + {C019C7EC-FDEE-4EAF-ABF1-89D946EFC95A}.Release|x86.Build.0 = Release|Any CPU + {68C9E09E-F7FA-4853-B512-6BCD02BB69C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {68C9E09E-F7FA-4853-B512-6BCD02BB69C1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {68C9E09E-F7FA-4853-B512-6BCD02BB69C1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {68C9E09E-F7FA-4853-B512-6BCD02BB69C1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {68C9E09E-F7FA-4853-B512-6BCD02BB69C1}.Debug|x86.ActiveCfg = Debug|Any CPU + {68C9E09E-F7FA-4853-B512-6BCD02BB69C1}.Debug|x86.Build.0 = Debug|Any CPU + {68C9E09E-F7FA-4853-B512-6BCD02BB69C1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {68C9E09E-F7FA-4853-B512-6BCD02BB69C1}.Release|Any CPU.Build.0 = Release|Any CPU + {68C9E09E-F7FA-4853-B512-6BCD02BB69C1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {68C9E09E-F7FA-4853-B512-6BCD02BB69C1}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {68C9E09E-F7FA-4853-B512-6BCD02BB69C1}.Release|x86.ActiveCfg = Release|Any CPU + {68C9E09E-F7FA-4853-B512-6BCD02BB69C1}.Release|x86.Build.0 = Release|Any CPU + {9F2C52EA-1869-4610-921F-5FD654582019}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9F2C52EA-1869-4610-921F-5FD654582019}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9F2C52EA-1869-4610-921F-5FD654582019}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {9F2C52EA-1869-4610-921F-5FD654582019}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {9F2C52EA-1869-4610-921F-5FD654582019}.Debug|x86.ActiveCfg = Debug|Any CPU + {9F2C52EA-1869-4610-921F-5FD654582019}.Debug|x86.Build.0 = Debug|Any CPU + {9F2C52EA-1869-4610-921F-5FD654582019}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9F2C52EA-1869-4610-921F-5FD654582019}.Release|Any CPU.Build.0 = Release|Any CPU + {9F2C52EA-1869-4610-921F-5FD654582019}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {9F2C52EA-1869-4610-921F-5FD654582019}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {9F2C52EA-1869-4610-921F-5FD654582019}.Release|x86.ActiveCfg = Release|Any CPU + {9F2C52EA-1869-4610-921F-5FD654582019}.Release|x86.Build.0 = Release|Any CPU + {AA074523-64D3-4CA7-8C2E-EACD977D2B19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AA074523-64D3-4CA7-8C2E-EACD977D2B19}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AA074523-64D3-4CA7-8C2E-EACD977D2B19}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {AA074523-64D3-4CA7-8C2E-EACD977D2B19}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {AA074523-64D3-4CA7-8C2E-EACD977D2B19}.Debug|x86.ActiveCfg = Debug|Any CPU + {AA074523-64D3-4CA7-8C2E-EACD977D2B19}.Debug|x86.Build.0 = Debug|Any CPU + {AA074523-64D3-4CA7-8C2E-EACD977D2B19}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AA074523-64D3-4CA7-8C2E-EACD977D2B19}.Release|Any CPU.Build.0 = Release|Any CPU + {AA074523-64D3-4CA7-8C2E-EACD977D2B19}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {AA074523-64D3-4CA7-8C2E-EACD977D2B19}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {AA074523-64D3-4CA7-8C2E-EACD977D2B19}.Release|x86.ActiveCfg = Release|Any CPU + {AA074523-64D3-4CA7-8C2E-EACD977D2B19}.Release|x86.Build.0 = Release|Any CPU + {5145333A-40F8-4754-BA47-EC1CCECBE986}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5145333A-40F8-4754-BA47-EC1CCECBE986}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5145333A-40F8-4754-BA47-EC1CCECBE986}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {5145333A-40F8-4754-BA47-EC1CCECBE986}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {5145333A-40F8-4754-BA47-EC1CCECBE986}.Debug|x86.ActiveCfg = Debug|Any CPU + {5145333A-40F8-4754-BA47-EC1CCECBE986}.Debug|x86.Build.0 = Debug|Any CPU + {5145333A-40F8-4754-BA47-EC1CCECBE986}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5145333A-40F8-4754-BA47-EC1CCECBE986}.Release|Any CPU.Build.0 = Release|Any CPU + {5145333A-40F8-4754-BA47-EC1CCECBE986}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {5145333A-40F8-4754-BA47-EC1CCECBE986}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {5145333A-40F8-4754-BA47-EC1CCECBE986}.Release|x86.ActiveCfg = Release|Any CPU + {5145333A-40F8-4754-BA47-EC1CCECBE986}.Release|x86.Build.0 = Release|Any CPU + {47D5BF2A-7B05-4630-8C7C-A682382EA6F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {47D5BF2A-7B05-4630-8C7C-A682382EA6F1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {47D5BF2A-7B05-4630-8C7C-A682382EA6F1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {47D5BF2A-7B05-4630-8C7C-A682382EA6F1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {47D5BF2A-7B05-4630-8C7C-A682382EA6F1}.Debug|x86.ActiveCfg = Debug|Any CPU + {47D5BF2A-7B05-4630-8C7C-A682382EA6F1}.Debug|x86.Build.0 = Debug|Any CPU + {47D5BF2A-7B05-4630-8C7C-A682382EA6F1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {47D5BF2A-7B05-4630-8C7C-A682382EA6F1}.Release|Any CPU.Build.0 = Release|Any CPU + {47D5BF2A-7B05-4630-8C7C-A682382EA6F1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {47D5BF2A-7B05-4630-8C7C-A682382EA6F1}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {47D5BF2A-7B05-4630-8C7C-A682382EA6F1}.Release|x86.ActiveCfg = Release|Any CPU + {47D5BF2A-7B05-4630-8C7C-A682382EA6F1}.Release|x86.Build.0 = Release|Any CPU + {72D40CFE-93B5-4877-92DC-E79203641342}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {72D40CFE-93B5-4877-92DC-E79203641342}.Debug|Any CPU.Build.0 = Debug|Any CPU + {72D40CFE-93B5-4877-92DC-E79203641342}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {72D40CFE-93B5-4877-92DC-E79203641342}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {72D40CFE-93B5-4877-92DC-E79203641342}.Debug|x86.ActiveCfg = Debug|Any CPU + {72D40CFE-93B5-4877-92DC-E79203641342}.Debug|x86.Build.0 = Debug|Any CPU + {72D40CFE-93B5-4877-92DC-E79203641342}.Release|Any CPU.ActiveCfg = Release|Any CPU + {72D40CFE-93B5-4877-92DC-E79203641342}.Release|Any CPU.Build.0 = Release|Any CPU + {72D40CFE-93B5-4877-92DC-E79203641342}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {72D40CFE-93B5-4877-92DC-E79203641342}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {72D40CFE-93B5-4877-92DC-E79203641342}.Release|x86.ActiveCfg = Release|Any CPU + {72D40CFE-93B5-4877-92DC-E79203641342}.Release|x86.Build.0 = Release|Any CPU + {62952E87-88DB-45BA-9FE0-8A24FA983750}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {62952E87-88DB-45BA-9FE0-8A24FA983750}.Debug|Any CPU.Build.0 = Debug|Any CPU + {62952E87-88DB-45BA-9FE0-8A24FA983750}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {62952E87-88DB-45BA-9FE0-8A24FA983750}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {62952E87-88DB-45BA-9FE0-8A24FA983750}.Debug|x86.ActiveCfg = Debug|Any CPU + {62952E87-88DB-45BA-9FE0-8A24FA983750}.Debug|x86.Build.0 = Debug|Any CPU + {62952E87-88DB-45BA-9FE0-8A24FA983750}.Release|Any CPU.ActiveCfg = Release|Any CPU + {62952E87-88DB-45BA-9FE0-8A24FA983750}.Release|Any CPU.Build.0 = Release|Any CPU + {62952E87-88DB-45BA-9FE0-8A24FA983750}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {62952E87-88DB-45BA-9FE0-8A24FA983750}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {62952E87-88DB-45BA-9FE0-8A24FA983750}.Release|x86.ActiveCfg = Release|Any CPU + {62952E87-88DB-45BA-9FE0-8A24FA983750}.Release|x86.Build.0 = Release|Any CPU + {F4879FAE-CD3C-4158-9BF0-B8D9294CCD0D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F4879FAE-CD3C-4158-9BF0-B8D9294CCD0D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F4879FAE-CD3C-4158-9BF0-B8D9294CCD0D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {F4879FAE-CD3C-4158-9BF0-B8D9294CCD0D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {F4879FAE-CD3C-4158-9BF0-B8D9294CCD0D}.Debug|x86.ActiveCfg = Debug|Any CPU + {F4879FAE-CD3C-4158-9BF0-B8D9294CCD0D}.Debug|x86.Build.0 = Debug|Any CPU + {F4879FAE-CD3C-4158-9BF0-B8D9294CCD0D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F4879FAE-CD3C-4158-9BF0-B8D9294CCD0D}.Release|Any CPU.Build.0 = Release|Any CPU + {F4879FAE-CD3C-4158-9BF0-B8D9294CCD0D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {F4879FAE-CD3C-4158-9BF0-B8D9294CCD0D}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {F4879FAE-CD3C-4158-9BF0-B8D9294CCD0D}.Release|x86.ActiveCfg = Release|Any CPU + {F4879FAE-CD3C-4158-9BF0-B8D9294CCD0D}.Release|x86.Build.0 = Release|Any CPU + {157F16EA-C5C1-4BDF-A81C-44A7771A13D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {157F16EA-C5C1-4BDF-A81C-44A7771A13D7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {157F16EA-C5C1-4BDF-A81C-44A7771A13D7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {157F16EA-C5C1-4BDF-A81C-44A7771A13D7}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {157F16EA-C5C1-4BDF-A81C-44A7771A13D7}.Debug|x86.ActiveCfg = Debug|Any CPU + {157F16EA-C5C1-4BDF-A81C-44A7771A13D7}.Debug|x86.Build.0 = Debug|Any CPU + {157F16EA-C5C1-4BDF-A81C-44A7771A13D7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {157F16EA-C5C1-4BDF-A81C-44A7771A13D7}.Release|Any CPU.Build.0 = Release|Any CPU + {157F16EA-C5C1-4BDF-A81C-44A7771A13D7}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {157F16EA-C5C1-4BDF-A81C-44A7771A13D7}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {157F16EA-C5C1-4BDF-A81C-44A7771A13D7}.Release|x86.ActiveCfg = Release|Any CPU + {157F16EA-C5C1-4BDF-A81C-44A7771A13D7}.Release|x86.Build.0 = Release|Any CPU + {99BB0544-6AA4-4787-B396-0AE77D022547}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {99BB0544-6AA4-4787-B396-0AE77D022547}.Debug|Any CPU.Build.0 = Debug|Any CPU + {99BB0544-6AA4-4787-B396-0AE77D022547}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {99BB0544-6AA4-4787-B396-0AE77D022547}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {99BB0544-6AA4-4787-B396-0AE77D022547}.Debug|x86.ActiveCfg = Debug|Any CPU + {99BB0544-6AA4-4787-B396-0AE77D022547}.Debug|x86.Build.0 = Debug|Any CPU + {99BB0544-6AA4-4787-B396-0AE77D022547}.Release|Any CPU.ActiveCfg = Release|Any CPU + {99BB0544-6AA4-4787-B396-0AE77D022547}.Release|Any CPU.Build.0 = Release|Any CPU + {99BB0544-6AA4-4787-B396-0AE77D022547}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {99BB0544-6AA4-4787-B396-0AE77D022547}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {99BB0544-6AA4-4787-B396-0AE77D022547}.Release|x86.ActiveCfg = Release|Any CPU + {99BB0544-6AA4-4787-B396-0AE77D022547}.Release|x86.Build.0 = Release|Any CPU + {0BB79FE3-F376-4352-97B3-382F7FFDDBE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0BB79FE3-F376-4352-97B3-382F7FFDDBE9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0BB79FE3-F376-4352-97B3-382F7FFDDBE9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {0BB79FE3-F376-4352-97B3-382F7FFDDBE9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {0BB79FE3-F376-4352-97B3-382F7FFDDBE9}.Debug|x86.ActiveCfg = Debug|Any CPU + {0BB79FE3-F376-4352-97B3-382F7FFDDBE9}.Debug|x86.Build.0 = Debug|Any CPU + {0BB79FE3-F376-4352-97B3-382F7FFDDBE9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0BB79FE3-F376-4352-97B3-382F7FFDDBE9}.Release|Any CPU.Build.0 = Release|Any CPU + {0BB79FE3-F376-4352-97B3-382F7FFDDBE9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {0BB79FE3-F376-4352-97B3-382F7FFDDBE9}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {0BB79FE3-F376-4352-97B3-382F7FFDDBE9}.Release|x86.ActiveCfg = Release|Any CPU + {0BB79FE3-F376-4352-97B3-382F7FFDDBE9}.Release|x86.Build.0 = Release|Any CPU + {4A300DA7-A19B-459D-96CA-C999B2CCABFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4A300DA7-A19B-459D-96CA-C999B2CCABFD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4A300DA7-A19B-459D-96CA-C999B2CCABFD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {4A300DA7-A19B-459D-96CA-C999B2CCABFD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {4A300DA7-A19B-459D-96CA-C999B2CCABFD}.Debug|x86.ActiveCfg = Debug|Any CPU + {4A300DA7-A19B-459D-96CA-C999B2CCABFD}.Debug|x86.Build.0 = Debug|Any CPU + {4A300DA7-A19B-459D-96CA-C999B2CCABFD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4A300DA7-A19B-459D-96CA-C999B2CCABFD}.Release|Any CPU.Build.0 = Release|Any CPU + {4A300DA7-A19B-459D-96CA-C999B2CCABFD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {4A300DA7-A19B-459D-96CA-C999B2CCABFD}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {4A300DA7-A19B-459D-96CA-C999B2CCABFD}.Release|x86.ActiveCfg = Release|Any CPU + {4A300DA7-A19B-459D-96CA-C999B2CCABFD}.Release|x86.Build.0 = Release|Any CPU + {53663DBF-D7FF-4BBF-8211-909237616049}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {53663DBF-D7FF-4BBF-8211-909237616049}.Debug|Any CPU.Build.0 = Debug|Any CPU + {53663DBF-D7FF-4BBF-8211-909237616049}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {53663DBF-D7FF-4BBF-8211-909237616049}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {53663DBF-D7FF-4BBF-8211-909237616049}.Debug|x86.ActiveCfg = Debug|Any CPU + {53663DBF-D7FF-4BBF-8211-909237616049}.Debug|x86.Build.0 = Debug|Any CPU + {53663DBF-D7FF-4BBF-8211-909237616049}.Release|Any CPU.ActiveCfg = Release|Any CPU + {53663DBF-D7FF-4BBF-8211-909237616049}.Release|Any CPU.Build.0 = Release|Any CPU + {53663DBF-D7FF-4BBF-8211-909237616049}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {53663DBF-D7FF-4BBF-8211-909237616049}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {53663DBF-D7FF-4BBF-8211-909237616049}.Release|x86.ActiveCfg = Release|Any CPU + {53663DBF-D7FF-4BBF-8211-909237616049}.Release|x86.Build.0 = Release|Any CPU + {134CDB3F-76CF-44D8-9621-F865092ACF20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {134CDB3F-76CF-44D8-9621-F865092ACF20}.Debug|Any CPU.Build.0 = Debug|Any CPU + {134CDB3F-76CF-44D8-9621-F865092ACF20}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {134CDB3F-76CF-44D8-9621-F865092ACF20}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {134CDB3F-76CF-44D8-9621-F865092ACF20}.Debug|x86.ActiveCfg = Debug|Any CPU + {134CDB3F-76CF-44D8-9621-F865092ACF20}.Debug|x86.Build.0 = Debug|Any CPU + {134CDB3F-76CF-44D8-9621-F865092ACF20}.Release|Any CPU.ActiveCfg = Release|Any CPU + {134CDB3F-76CF-44D8-9621-F865092ACF20}.Release|Any CPU.Build.0 = Release|Any CPU + {134CDB3F-76CF-44D8-9621-F865092ACF20}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {134CDB3F-76CF-44D8-9621-F865092ACF20}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {134CDB3F-76CF-44D8-9621-F865092ACF20}.Release|x86.ActiveCfg = Release|Any CPU + {134CDB3F-76CF-44D8-9621-F865092ACF20}.Release|x86.Build.0 = Release|Any CPU + {23F77F9B-2979-4DF0-9096-C090CE7BE09D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {23F77F9B-2979-4DF0-9096-C090CE7BE09D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {23F77F9B-2979-4DF0-9096-C090CE7BE09D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {23F77F9B-2979-4DF0-9096-C090CE7BE09D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {23F77F9B-2979-4DF0-9096-C090CE7BE09D}.Debug|x86.ActiveCfg = Debug|Any CPU + {23F77F9B-2979-4DF0-9096-C090CE7BE09D}.Debug|x86.Build.0 = Debug|Any CPU + {23F77F9B-2979-4DF0-9096-C090CE7BE09D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {23F77F9B-2979-4DF0-9096-C090CE7BE09D}.Release|Any CPU.Build.0 = Release|Any CPU + {23F77F9B-2979-4DF0-9096-C090CE7BE09D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {23F77F9B-2979-4DF0-9096-C090CE7BE09D}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {23F77F9B-2979-4DF0-9096-C090CE7BE09D}.Release|x86.ActiveCfg = Release|Any CPU + {23F77F9B-2979-4DF0-9096-C090CE7BE09D}.Release|x86.Build.0 = Release|Any CPU + {B079D8A1-6CC1-46D8-948A-523AA6836FF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B079D8A1-6CC1-46D8-948A-523AA6836FF9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B079D8A1-6CC1-46D8-948A-523AA6836FF9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {B079D8A1-6CC1-46D8-948A-523AA6836FF9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {B079D8A1-6CC1-46D8-948A-523AA6836FF9}.Debug|x86.ActiveCfg = Debug|Any CPU + {B079D8A1-6CC1-46D8-948A-523AA6836FF9}.Debug|x86.Build.0 = Debug|Any CPU + {B079D8A1-6CC1-46D8-948A-523AA6836FF9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B079D8A1-6CC1-46D8-948A-523AA6836FF9}.Release|Any CPU.Build.0 = Release|Any CPU + {B079D8A1-6CC1-46D8-948A-523AA6836FF9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {B079D8A1-6CC1-46D8-948A-523AA6836FF9}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {B079D8A1-6CC1-46D8-948A-523AA6836FF9}.Release|x86.ActiveCfg = Release|Any CPU + {B079D8A1-6CC1-46D8-948A-523AA6836FF9}.Release|x86.Build.0 = Release|Any CPU + {7CD48059-3ACF-4435-B6D5-F4F4B379F8B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7CD48059-3ACF-4435-B6D5-F4F4B379F8B1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7CD48059-3ACF-4435-B6D5-F4F4B379F8B1}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {7CD48059-3ACF-4435-B6D5-F4F4B379F8B1}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {7CD48059-3ACF-4435-B6D5-F4F4B379F8B1}.Debug|x86.ActiveCfg = Debug|Any CPU + {7CD48059-3ACF-4435-B6D5-F4F4B379F8B1}.Debug|x86.Build.0 = Debug|Any CPU + {7CD48059-3ACF-4435-B6D5-F4F4B379F8B1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7CD48059-3ACF-4435-B6D5-F4F4B379F8B1}.Release|Any CPU.Build.0 = Release|Any CPU + {7CD48059-3ACF-4435-B6D5-F4F4B379F8B1}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {7CD48059-3ACF-4435-B6D5-F4F4B379F8B1}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {7CD48059-3ACF-4435-B6D5-F4F4B379F8B1}.Release|x86.ActiveCfg = Release|Any CPU + {7CD48059-3ACF-4435-B6D5-F4F4B379F8B1}.Release|x86.Build.0 = Release|Any CPU + {21C75A50-991B-44D2-B684-732733969C23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {21C75A50-991B-44D2-B684-732733969C23}.Debug|Any CPU.Build.0 = Debug|Any CPU + {21C75A50-991B-44D2-B684-732733969C23}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {21C75A50-991B-44D2-B684-732733969C23}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {21C75A50-991B-44D2-B684-732733969C23}.Debug|x86.ActiveCfg = Debug|Any CPU + {21C75A50-991B-44D2-B684-732733969C23}.Debug|x86.Build.0 = Debug|Any CPU + {21C75A50-991B-44D2-B684-732733969C23}.Release|Any CPU.ActiveCfg = Release|Any CPU + {21C75A50-991B-44D2-B684-732733969C23}.Release|Any CPU.Build.0 = Release|Any CPU + {21C75A50-991B-44D2-B684-732733969C23}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {21C75A50-991B-44D2-B684-732733969C23}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {21C75A50-991B-44D2-B684-732733969C23}.Release|x86.ActiveCfg = Release|Any CPU + {21C75A50-991B-44D2-B684-732733969C23}.Release|x86.Build.0 = Release|Any CPU + {92A8AB5D-4BA1-43B4-A769-62DCDEFEB04C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {92A8AB5D-4BA1-43B4-A769-62DCDEFEB04C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {92A8AB5D-4BA1-43B4-A769-62DCDEFEB04C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {92A8AB5D-4BA1-43B4-A769-62DCDEFEB04C}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {92A8AB5D-4BA1-43B4-A769-62DCDEFEB04C}.Debug|x86.ActiveCfg = Debug|Any CPU + {92A8AB5D-4BA1-43B4-A769-62DCDEFEB04C}.Debug|x86.Build.0 = Debug|Any CPU + {92A8AB5D-4BA1-43B4-A769-62DCDEFEB04C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {92A8AB5D-4BA1-43B4-A769-62DCDEFEB04C}.Release|Any CPU.Build.0 = Release|Any CPU + {92A8AB5D-4BA1-43B4-A769-62DCDEFEB04C}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {92A8AB5D-4BA1-43B4-A769-62DCDEFEB04C}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {92A8AB5D-4BA1-43B4-A769-62DCDEFEB04C}.Release|x86.ActiveCfg = Release|Any CPU + {92A8AB5D-4BA1-43B4-A769-62DCDEFEB04C}.Release|x86.Build.0 = Release|Any CPU + {ABF8187A-F6FF-4722-B625-897B385F6CEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {ABF8187A-F6FF-4722-B625-897B385F6CEC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {ABF8187A-F6FF-4722-B625-897B385F6CEC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {ABF8187A-F6FF-4722-B625-897B385F6CEC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {ABF8187A-F6FF-4722-B625-897B385F6CEC}.Debug|x86.ActiveCfg = Debug|Any CPU + {ABF8187A-F6FF-4722-B625-897B385F6CEC}.Debug|x86.Build.0 = Debug|Any CPU + {ABF8187A-F6FF-4722-B625-897B385F6CEC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {ABF8187A-F6FF-4722-B625-897B385F6CEC}.Release|Any CPU.Build.0 = Release|Any CPU + {ABF8187A-F6FF-4722-B625-897B385F6CEC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {ABF8187A-F6FF-4722-B625-897B385F6CEC}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {ABF8187A-F6FF-4722-B625-897B385F6CEC}.Release|x86.ActiveCfg = Release|Any CPU + {ABF8187A-F6FF-4722-B625-897B385F6CEC}.Release|x86.Build.0 = Release|Any CPU + {6EFC8D17-47E9-44F7-897E-4F1102B16DF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6EFC8D17-47E9-44F7-897E-4F1102B16DF4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6EFC8D17-47E9-44F7-897E-4F1102B16DF4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {6EFC8D17-47E9-44F7-897E-4F1102B16DF4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {6EFC8D17-47E9-44F7-897E-4F1102B16DF4}.Debug|x86.ActiveCfg = Debug|Any CPU + {6EFC8D17-47E9-44F7-897E-4F1102B16DF4}.Debug|x86.Build.0 = Debug|Any CPU + {6EFC8D17-47E9-44F7-897E-4F1102B16DF4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6EFC8D17-47E9-44F7-897E-4F1102B16DF4}.Release|Any CPU.Build.0 = Release|Any CPU + {6EFC8D17-47E9-44F7-897E-4F1102B16DF4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {6EFC8D17-47E9-44F7-897E-4F1102B16DF4}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {6EFC8D17-47E9-44F7-897E-4F1102B16DF4}.Release|x86.ActiveCfg = Release|Any CPU + {6EFC8D17-47E9-44F7-897E-4F1102B16DF4}.Release|x86.Build.0 = Release|Any CPU + {B2624173-3535-4138-9F90-420D83772ABC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B2624173-3535-4138-9F90-420D83772ABC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B2624173-3535-4138-9F90-420D83772ABC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {B2624173-3535-4138-9F90-420D83772ABC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {B2624173-3535-4138-9F90-420D83772ABC}.Debug|x86.ActiveCfg = Debug|Any CPU + {B2624173-3535-4138-9F90-420D83772ABC}.Debug|x86.Build.0 = Debug|Any CPU + {B2624173-3535-4138-9F90-420D83772ABC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B2624173-3535-4138-9F90-420D83772ABC}.Release|Any CPU.Build.0 = Release|Any CPU + {B2624173-3535-4138-9F90-420D83772ABC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {B2624173-3535-4138-9F90-420D83772ABC}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {B2624173-3535-4138-9F90-420D83772ABC}.Release|x86.ActiveCfg = Release|Any CPU + {B2624173-3535-4138-9F90-420D83772ABC}.Release|x86.Build.0 = Release|Any CPU + {1403D49E-C3DB-49E8-A888-541F0C8F9DCD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1403D49E-C3DB-49E8-A888-541F0C8F9DCD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1403D49E-C3DB-49E8-A888-541F0C8F9DCD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {1403D49E-C3DB-49E8-A888-541F0C8F9DCD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {1403D49E-C3DB-49E8-A888-541F0C8F9DCD}.Debug|x86.ActiveCfg = Debug|Any CPU + {1403D49E-C3DB-49E8-A888-541F0C8F9DCD}.Debug|x86.Build.0 = Debug|Any CPU + {1403D49E-C3DB-49E8-A888-541F0C8F9DCD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1403D49E-C3DB-49E8-A888-541F0C8F9DCD}.Release|Any CPU.Build.0 = Release|Any CPU + {1403D49E-C3DB-49E8-A888-541F0C8F9DCD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {1403D49E-C3DB-49E8-A888-541F0C8F9DCD}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {1403D49E-C3DB-49E8-A888-541F0C8F9DCD}.Release|x86.ActiveCfg = Release|Any CPU + {1403D49E-C3DB-49E8-A888-541F0C8F9DCD}.Release|x86.Build.0 = Release|Any CPU + {36C62FC6-8496-492D-A2F9-BF68CC6520BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {36C62FC6-8496-492D-A2F9-BF68CC6520BB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {36C62FC6-8496-492D-A2F9-BF68CC6520BB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {36C62FC6-8496-492D-A2F9-BF68CC6520BB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {36C62FC6-8496-492D-A2F9-BF68CC6520BB}.Debug|x86.ActiveCfg = Debug|Any CPU + {36C62FC6-8496-492D-A2F9-BF68CC6520BB}.Debug|x86.Build.0 = Debug|Any CPU + {36C62FC6-8496-492D-A2F9-BF68CC6520BB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {36C62FC6-8496-492D-A2F9-BF68CC6520BB}.Release|Any CPU.Build.0 = Release|Any CPU + {36C62FC6-8496-492D-A2F9-BF68CC6520BB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {36C62FC6-8496-492D-A2F9-BF68CC6520BB}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {36C62FC6-8496-492D-A2F9-BF68CC6520BB}.Release|x86.ActiveCfg = Release|Any CPU + {36C62FC6-8496-492D-A2F9-BF68CC6520BB}.Release|x86.Build.0 = Release|Any CPU + {D54A8DCC-801E-4407-A9CC-01E4C33A72EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D54A8DCC-801E-4407-A9CC-01E4C33A72EB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D54A8DCC-801E-4407-A9CC-01E4C33A72EB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {D54A8DCC-801E-4407-A9CC-01E4C33A72EB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {D54A8DCC-801E-4407-A9CC-01E4C33A72EB}.Debug|x86.ActiveCfg = Debug|Any CPU + {D54A8DCC-801E-4407-A9CC-01E4C33A72EB}.Debug|x86.Build.0 = Debug|Any CPU + {D54A8DCC-801E-4407-A9CC-01E4C33A72EB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D54A8DCC-801E-4407-A9CC-01E4C33A72EB}.Release|Any CPU.Build.0 = Release|Any CPU + {D54A8DCC-801E-4407-A9CC-01E4C33A72EB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {D54A8DCC-801E-4407-A9CC-01E4C33A72EB}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {D54A8DCC-801E-4407-A9CC-01E4C33A72EB}.Release|x86.ActiveCfg = Release|Any CPU + {D54A8DCC-801E-4407-A9CC-01E4C33A72EB}.Release|x86.Build.0 = Release|Any CPU + {13CB4F98-F361-4989-BBC2-0B0ECDAC68F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {13CB4F98-F361-4989-BBC2-0B0ECDAC68F3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {13CB4F98-F361-4989-BBC2-0B0ECDAC68F3}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {13CB4F98-F361-4989-BBC2-0B0ECDAC68F3}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {13CB4F98-F361-4989-BBC2-0B0ECDAC68F3}.Debug|x86.ActiveCfg = Debug|Any CPU + {13CB4F98-F361-4989-BBC2-0B0ECDAC68F3}.Debug|x86.Build.0 = Debug|Any CPU + {13CB4F98-F361-4989-BBC2-0B0ECDAC68F3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {13CB4F98-F361-4989-BBC2-0B0ECDAC68F3}.Release|Any CPU.Build.0 = Release|Any CPU + {13CB4F98-F361-4989-BBC2-0B0ECDAC68F3}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {13CB4F98-F361-4989-BBC2-0B0ECDAC68F3}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {13CB4F98-F361-4989-BBC2-0B0ECDAC68F3}.Release|x86.ActiveCfg = Release|Any CPU + {13CB4F98-F361-4989-BBC2-0B0ECDAC68F3}.Release|x86.Build.0 = Release|Any CPU + {0A2B5ED2-E9A7-41A5-9B0F-10007673F2D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0A2B5ED2-E9A7-41A5-9B0F-10007673F2D9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0A2B5ED2-E9A7-41A5-9B0F-10007673F2D9}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {0A2B5ED2-E9A7-41A5-9B0F-10007673F2D9}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {0A2B5ED2-E9A7-41A5-9B0F-10007673F2D9}.Debug|x86.ActiveCfg = Debug|Any CPU + {0A2B5ED2-E9A7-41A5-9B0F-10007673F2D9}.Debug|x86.Build.0 = Debug|Any CPU + {0A2B5ED2-E9A7-41A5-9B0F-10007673F2D9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0A2B5ED2-E9A7-41A5-9B0F-10007673F2D9}.Release|Any CPU.Build.0 = Release|Any CPU + {0A2B5ED2-E9A7-41A5-9B0F-10007673F2D9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {0A2B5ED2-E9A7-41A5-9B0F-10007673F2D9}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {0A2B5ED2-E9A7-41A5-9B0F-10007673F2D9}.Release|x86.ActiveCfg = Release|Any CPU + {0A2B5ED2-E9A7-41A5-9B0F-10007673F2D9}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -961,6 +1499,45 @@ Global {CBF23034-2249-4FE5-BD48-5F3CEAC0DF61} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E} {E83D3745-9BCF-40E8-8D34-AFBA604C2439} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} {17122147-ADFD-41C8-87D9-CCC582CCA8F9} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C} + {0930C2EA-FA36-4EDF-A571-215765D1F2C7} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4} + {A273BAAB-DA92-401D-B781-ADA9E3B7717C} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4} + {E07B7D3A-1D4D-4644-84C2-06FEDB64885B} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4} + {0F5F9381-D3B4-4E0D-9FAA-CC12520DBB4A} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4} + {2E18C4FD-9982-4BD9-A067-3CE56E68C450} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4} + {C79D9793-FADA-4B1A-8AD7-8AEDB2358CA2} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4} + {BCD18147-D96D-4240-A89F-5F890392E58E} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4} + {986BF4FD-D0E3-48AE-917C-6C168D6395D3} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4} + {F4E1F1ED-2DE9-4659-B2E7-C9B6B8454AD1} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4} + {F4846AC2-384E-4C0B-8DE5-9784715E4A9F} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4} + {C019C7EC-FDEE-4EAF-ABF1-89D946EFC95A} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4} + {68C9E09E-F7FA-4853-B512-6BCD02BB69C1} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4} + {9F2C52EA-1869-4610-921F-5FD654582019} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4} + {AA074523-64D3-4CA7-8C2E-EACD977D2B19} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4} + {5145333A-40F8-4754-BA47-EC1CCECBE986} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4} + {47D5BF2A-7B05-4630-8C7C-A682382EA6F1} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4} + {72D40CFE-93B5-4877-92DC-E79203641342} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4} + {62952E87-88DB-45BA-9FE0-8A24FA983750} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4} + {F4879FAE-CD3C-4158-9BF0-B8D9294CCD0D} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4} + {157F16EA-C5C1-4BDF-A81C-44A7771A13D7} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4} + {5C8A337A-956B-4045-A680-4A61942D0866} = {83D016A9-7233-43FC-94C1-0AF2619D136B} + {99BB0544-6AA4-4787-B396-0AE77D022547} = {83D016A9-7233-43FC-94C1-0AF2619D136B} + {0BB79FE3-F376-4352-97B3-382F7FFDDBE9} = {83D016A9-7233-43FC-94C1-0AF2619D136B} + {4A300DA7-A19B-459D-96CA-C999B2CCABFD} = {83D016A9-7233-43FC-94C1-0AF2619D136B} + {53663DBF-D7FF-4BBF-8211-909237616049} = {5C8A337A-956B-4045-A680-4A61942D0866} + {134CDB3F-76CF-44D8-9621-F865092ACF20} = {5C8A337A-956B-4045-A680-4A61942D0866} + {23F77F9B-2979-4DF0-9096-C090CE7BE09D} = {5C8A337A-956B-4045-A680-4A61942D0866} + {B079D8A1-6CC1-46D8-948A-523AA6836FF9} = {5C8A337A-956B-4045-A680-4A61942D0866} + {7CD48059-3ACF-4435-B6D5-F4F4B379F8B1} = {5C8A337A-956B-4045-A680-4A61942D0866} + {21C75A50-991B-44D2-B684-732733969C23} = {5C8A337A-956B-4045-A680-4A61942D0866} + {92A8AB5D-4BA1-43B4-A769-62DCDEFEB04C} = {5C8A337A-956B-4045-A680-4A61942D0866} + {ABF8187A-F6FF-4722-B625-897B385F6CEC} = {5C8A337A-956B-4045-A680-4A61942D0866} + {6EFC8D17-47E9-44F7-897E-4F1102B16DF4} = {5C8A337A-956B-4045-A680-4A61942D0866} + {B2624173-3535-4138-9F90-420D83772ABC} = {5C8A337A-956B-4045-A680-4A61942D0866} + {1403D49E-C3DB-49E8-A888-541F0C8F9DCD} = {5C8A337A-956B-4045-A680-4A61942D0866} + {36C62FC6-8496-492D-A2F9-BF68CC6520BB} = {5C8A337A-956B-4045-A680-4A61942D0866} + {D54A8DCC-801E-4407-A9CC-01E4C33A72EB} = {5C8A337A-956B-4045-A680-4A61942D0866} + {13CB4F98-F361-4989-BBC2-0B0ECDAC68F3} = {5C8A337A-956B-4045-A680-4A61942D0866} + {0A2B5ED2-E9A7-41A5-9B0F-10007673F2D9} = {83D016A9-7233-43FC-94C1-0AF2619D136B} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {63D344F6-F86D-40E6-85B9-0AABBE338C4A} diff --git a/src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tasks/GetDotNetHost.cs b/src/Mvc/ViewCompilation.Tasks/GetDotNetHost.cs similarity index 100% rename from src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tasks/GetDotNetHost.cs rename to src/Mvc/ViewCompilation.Tasks/GetDotNetHost.cs diff --git a/src/Mvc/ViewCompilation.Tasks/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tasks.csproj b/src/Mvc/ViewCompilation.Tasks/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tasks.csproj new file mode 100644 index 0000000000..02c8f5e0ba --- /dev/null +++ b/src/Mvc/ViewCompilation.Tasks/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tasks.csproj @@ -0,0 +1,18 @@ + + + + Microsoft Build Tasks supporting Razor view compilation. + netstandard2.0 + false + false + + true + false + + + + + + + + diff --git a/src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/AssemblyMetadataGenerator.cs b/src/Mvc/ViewCompilation/src/Internal/AssemblyMetadataGenerator.cs similarity index 100% rename from src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/AssemblyMetadataGenerator.cs rename to src/Mvc/ViewCompilation/src/Internal/AssemblyMetadataGenerator.cs diff --git a/src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/CompilationOptions.cs b/src/Mvc/ViewCompilation/src/Internal/CompilationOptions.cs similarity index 100% rename from src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/CompilationOptions.cs rename to src/Mvc/ViewCompilation/src/Internal/CompilationOptions.cs diff --git a/src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/DebugHelper.cs b/src/Mvc/ViewCompilation/src/Internal/DebugHelper.cs similarity index 100% rename from src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/DebugHelper.cs rename to src/Mvc/ViewCompilation/src/Internal/DebugHelper.cs diff --git a/src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/MvcServiceProvider.cs b/src/Mvc/ViewCompilation/src/Internal/MvcServiceProvider.cs similarity index 100% rename from src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/MvcServiceProvider.cs rename to src/Mvc/ViewCompilation/src/Internal/MvcServiceProvider.cs diff --git a/src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/PrecompilationApplication.cs b/src/Mvc/ViewCompilation/src/Internal/PrecompilationApplication.cs similarity index 100% rename from src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/PrecompilationApplication.cs rename to src/Mvc/ViewCompilation/src/Internal/PrecompilationApplication.cs diff --git a/src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/PrecompileRunCommand.cs b/src/Mvc/ViewCompilation/src/Internal/PrecompileRunCommand.cs similarity index 100% rename from src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/PrecompileRunCommand.cs rename to src/Mvc/ViewCompilation/src/Internal/PrecompileRunCommand.cs diff --git a/src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/SnkUtils.cs b/src/Mvc/ViewCompilation/src/Internal/SnkUtils.cs similarity index 100% rename from src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/SnkUtils.cs rename to src/Mvc/ViewCompilation/src/Internal/SnkUtils.cs diff --git a/src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/ViewCompilationInfo.cs b/src/Mvc/ViewCompilation/src/Internal/ViewCompilationInfo.cs similarity index 100% rename from src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/ViewCompilationInfo.cs rename to src/Mvc/ViewCompilation/src/Internal/ViewCompilationInfo.cs diff --git a/src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/ViewFileInfo.cs b/src/Mvc/ViewCompilation/src/Internal/ViewFileInfo.cs similarity index 100% rename from src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/ViewFileInfo.cs rename to src/Mvc/ViewCompilation/src/Internal/ViewFileInfo.cs diff --git a/src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.csproj b/src/Mvc/ViewCompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.csproj similarity index 83% rename from src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.csproj rename to src/Mvc/ViewCompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.csproj index d62970e4ed..440f8a96e4 100644 --- a/src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.csproj +++ b/src/Mvc/ViewCompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.csproj @@ -7,10 +7,11 @@ cshtml;razor;compilation;precompilation;aspnetcore true exe - ..\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tasks\ + ..\..\ViewCompilation.Tasks\ false false $(MSBuildProjectName).nuspec + Microsoft.AspNetCore.Mvc.Razor.ViewCompilation @@ -20,18 +21,20 @@ false bin\$(Configuration)\net461\win7-$(PlatformTarget) obj\$(Configuration)\net461\win7-$(PlatformTarget) + false - - - + + + + - + ``` @@ -44,12 +41,12 @@ Some aspects of view compilation can be configured by editing the project: * `MvcRazorCompileOnPublish`: Setting this to `false` turns off all functions of view compilation that are enabled as part of publishing. -* `MvcRazorExcludeViewFilesFromPublish`: Enabling `MvcRazorCompileOnPublish` prevents .cshtml files from being published. This option disables this behavior. +* `MvcRazorExcludeViewFilesFromPublish`: Enabling `MvcRazorCompileOnPublish` prevents .cshtml files from being published. This option disables this behavior. Note: ASP.NET Core Mvc does not support updateable precompiled views. Any modifications to published cshtml files will be ignored if a precompiled view is discovered for that path. * `MvcRazorExcludeRefAssembliesFromPublish`: Enabling `MvcRazorCompileOnPublish` causes the target to prevent the `refs` directory from being published. This option disables this behavior. Note: Setting this option is useful if your application is using a mix of precompiled and runtime compiled views. - + * `MvcRazorFilesToCompile`: An item group that specifies view files to compile. By default this includes all .cshtml files marked as content. 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. diff --git a/src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/baseline.netcore.json b/src/Mvc/ViewCompilation/src/baseline.netcore.json similarity index 100% rename from src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/baseline.netcore.json rename to src/Mvc/ViewCompilation/src/baseline.netcore.json diff --git a/src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.targets b/src/Mvc/ViewCompilation/src/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.targets similarity index 100% rename from src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.targets rename to src/Mvc/ViewCompilation/src/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.targets diff --git a/src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/lib/net461/_._ b/src/Mvc/ViewCompilation/src/lib/net461/_._ similarity index 100% rename from src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/lib/net461/_._ rename to src/Mvc/ViewCompilation/src/lib/net461/_._ diff --git a/src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/lib/netcoreapp2.0/_._ b/src/Mvc/ViewCompilation/src/lib/netcoreapp2.0/_._ similarity index 100% rename from src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/lib/netcoreapp2.0/_._ rename to src/Mvc/ViewCompilation/src/lib/netcoreapp2.0/_._ diff --git a/src/MvcPrecompilation/test/FunctionalTests/CoreCLRTests/CoreCLRApplicationTestFixture.cs b/src/Mvc/ViewCompilation/test/FunctionalTests/CoreCLRTests/CoreCLRApplicationTestFixture.cs similarity index 100% rename from src/MvcPrecompilation/test/FunctionalTests/CoreCLRTests/CoreCLRApplicationTestFixture.cs rename to src/Mvc/ViewCompilation/test/FunctionalTests/CoreCLRTests/CoreCLRApplicationTestFixture.cs diff --git a/src/MvcPrecompilation/test/FunctionalTests/CoreCLRTests/SimpleAppTest_CoreCLR.cs b/src/Mvc/ViewCompilation/test/FunctionalTests/CoreCLRTests/SimpleAppTest_CoreCLR.cs similarity index 100% rename from src/MvcPrecompilation/test/FunctionalTests/CoreCLRTests/SimpleAppTest_CoreCLR.cs rename to src/Mvc/ViewCompilation/test/FunctionalTests/CoreCLRTests/SimpleAppTest_CoreCLR.cs diff --git a/src/MvcPrecompilation/test/FunctionalTests/DesktopTests/DesktopApplicationTestFixture.cs b/src/Mvc/ViewCompilation/test/FunctionalTests/DesktopTests/DesktopApplicationTestFixture.cs similarity index 100% rename from src/MvcPrecompilation/test/FunctionalTests/DesktopTests/DesktopApplicationTestFixture.cs rename to src/Mvc/ViewCompilation/test/FunctionalTests/DesktopTests/DesktopApplicationTestFixture.cs diff --git a/src/MvcPrecompilation/test/FunctionalTests/DesktopTests/SimpleAppTest_Desktop.cs b/src/Mvc/ViewCompilation/test/FunctionalTests/DesktopTests/SimpleAppTest_Desktop.cs similarity index 92% rename from src/MvcPrecompilation/test/FunctionalTests/DesktopTests/SimpleAppTest_Desktop.cs rename to src/Mvc/ViewCompilation/test/FunctionalTests/DesktopTests/SimpleAppTest_Desktop.cs index e3fa91caa5..5b1413ab2c 100644 --- a/src/MvcPrecompilation/test/FunctionalTests/DesktopTests/SimpleAppTest_Desktop.cs +++ b/src/Mvc/ViewCompilation/test/FunctionalTests/DesktopTests/SimpleAppTest_Desktop.cs @@ -25,7 +25,7 @@ namespace FunctionalTests public ApplicationTestFixture Fixture { get; } - [ConditionalFact] + [ConditionalFact(Skip="Doesn't work on full framework: https://github.com/aspnet/AspNetCore/issues/6499")] public async Task Precompilation_WorksForSimpleApps() { using (StartLog(out var loggerFactory)) diff --git a/src/MvcPrecompilation/test/FunctionalTests/Infrastructure/ApplicationPaths.cs b/src/Mvc/ViewCompilation/test/FunctionalTests/Infrastructure/ApplicationPaths.cs similarity index 81% rename from src/MvcPrecompilation/test/FunctionalTests/Infrastructure/ApplicationPaths.cs rename to src/Mvc/ViewCompilation/test/FunctionalTests/Infrastructure/ApplicationPaths.cs index d0b044adb9..cad4f8de9a 100644 --- a/src/MvcPrecompilation/test/FunctionalTests/Infrastructure/ApplicationPaths.cs +++ b/src/Mvc/ViewCompilation/test/FunctionalTests/Infrastructure/ApplicationPaths.cs @@ -8,14 +8,12 @@ namespace FunctionalTests { public static class ApplicationPaths { - private const string SolutionName = "RazorViewCompilation.sln"; + private const string SolutionName = "Mvc.sln"; public static string SolutionDirectory { get; } = GetSolutionDirectory(); - public static string ArtifactPackagesDirectory => Path.Combine(SolutionDirectory, "artifacts", "build"); - public static string GetTestAppDirectory(string appName) => - Path.Combine(SolutionDirectory, "testapps", appName); + Path.Combine(SolutionDirectory, "ViewCompilation", "testassets", appName); private static string GetSolutionDirectory() { diff --git a/src/MvcPrecompilation/test/FunctionalTests/Infrastructure/ApplicationTestFixture.cs b/src/Mvc/ViewCompilation/test/FunctionalTests/Infrastructure/ApplicationTestFixture.cs similarity index 100% rename from src/MvcPrecompilation/test/FunctionalTests/Infrastructure/ApplicationTestFixture.cs rename to src/Mvc/ViewCompilation/test/FunctionalTests/Infrastructure/ApplicationTestFixture.cs diff --git a/src/MvcPrecompilation/test/FunctionalTests/Infrastructure/HttpClientExtensions.cs b/src/Mvc/ViewCompilation/test/FunctionalTests/Infrastructure/HttpClientExtensions.cs similarity index 100% rename from src/MvcPrecompilation/test/FunctionalTests/Infrastructure/HttpClientExtensions.cs rename to src/Mvc/ViewCompilation/test/FunctionalTests/Infrastructure/HttpClientExtensions.cs diff --git a/src/MvcPrecompilation/test/FunctionalTests/Infrastructure/PublishOnlyDeployer.cs b/src/Mvc/ViewCompilation/test/FunctionalTests/Infrastructure/PublishOnlyDeployer.cs similarity index 100% rename from src/MvcPrecompilation/test/FunctionalTests/Infrastructure/PublishOnlyDeployer.cs rename to src/Mvc/ViewCompilation/test/FunctionalTests/Infrastructure/PublishOnlyDeployer.cs diff --git a/src/MvcPrecompilation/test/FunctionalTests/Infrastructure/TestEmbeddedResource.cs b/src/Mvc/ViewCompilation/test/FunctionalTests/Infrastructure/TestEmbeddedResource.cs similarity index 100% rename from src/MvcPrecompilation/test/FunctionalTests/Infrastructure/TestEmbeddedResource.cs rename to src/Mvc/ViewCompilation/test/FunctionalTests/Infrastructure/TestEmbeddedResource.cs diff --git a/src/Mvc/ViewCompilation/test/FunctionalTests/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.FunctionalTests.csproj b/src/Mvc/ViewCompilation/test/FunctionalTests/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.FunctionalTests.csproj new file mode 100644 index 0000000000..a907e6c3e5 --- /dev/null +++ b/src/Mvc/ViewCompilation/test/FunctionalTests/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.FunctionalTests.csproj @@ -0,0 +1,50 @@ + + + + netcoreapp2.1;net461 + + $(DefineConstants);__remove_this_to__GENERATE_BASELINES + $(DefineConstants);GENERATE_BASELINES + false + false + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/MvcPrecompilation/test/FunctionalTests/Properties/AssemblyInfo.cs b/src/Mvc/ViewCompilation/test/FunctionalTests/Properties/AssemblyInfo.cs similarity index 100% rename from src/MvcPrecompilation/test/FunctionalTests/Properties/AssemblyInfo.cs rename to src/Mvc/ViewCompilation/test/FunctionalTests/Properties/AssemblyInfo.cs diff --git a/src/MvcPrecompilation/test/FunctionalTests/Resources/SimpleAppTest.Home.Index.txt b/src/Mvc/ViewCompilation/test/FunctionalTests/Resources/SimpleAppTest.Home.Index.txt similarity index 100% rename from src/MvcPrecompilation/test/FunctionalTests/Resources/SimpleAppTest.Home.Index.txt rename to src/Mvc/ViewCompilation/test/FunctionalTests/Resources/SimpleAppTest.Home.Index.txt diff --git a/src/MvcPrecompilation/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test.csproj b/src/Mvc/ViewCompilation/test/UnitTests/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test.csproj similarity index 55% rename from src/MvcPrecompilation/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test.csproj rename to src/Mvc/ViewCompilation/test/UnitTests/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test.csproj index 321b021bc6..7f3e4d7d88 100644 --- a/src/MvcPrecompilation/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test.csproj +++ b/src/Mvc/ViewCompilation/test/UnitTests/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test.csproj @@ -5,7 +5,7 @@ - + diff --git a/src/MvcPrecompilation/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test/PrecompileRunCommandTest.cs b/src/Mvc/ViewCompilation/test/UnitTests/PrecompileRunCommandTest.cs similarity index 100% rename from src/MvcPrecompilation/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test/PrecompileRunCommandTest.cs rename to src/Mvc/ViewCompilation/test/UnitTests/PrecompileRunCommandTest.cs diff --git a/src/Mvc/ViewCompilation/testassets/ApplicationUsingRelativePaths/ApplicationUsingRelativePaths.csproj b/src/Mvc/ViewCompilation/testassets/ApplicationUsingRelativePaths/ApplicationUsingRelativePaths.csproj new file mode 100644 index 0000000000..3540ab1a64 --- /dev/null +++ b/src/Mvc/ViewCompilation/testassets/ApplicationUsingRelativePaths/ApplicationUsingRelativePaths.csproj @@ -0,0 +1,16 @@ + + + + netcoreapp2.1;net461 + + true + + + + + + + + + + diff --git a/src/MvcPrecompilation/testapps/ApplicationUsingRelativePaths/Controllers/HomeController.cs b/src/Mvc/ViewCompilation/testassets/ApplicationUsingRelativePaths/Controllers/HomeController.cs similarity index 100% rename from src/MvcPrecompilation/testapps/ApplicationUsingRelativePaths/Controllers/HomeController.cs rename to src/Mvc/ViewCompilation/testassets/ApplicationUsingRelativePaths/Controllers/HomeController.cs diff --git a/src/MvcPrecompilation/testapps/ApplicationUsingRelativePaths/Program.cs b/src/Mvc/ViewCompilation/testassets/ApplicationUsingRelativePaths/Program.cs similarity index 100% rename from src/MvcPrecompilation/testapps/ApplicationUsingRelativePaths/Program.cs rename to src/Mvc/ViewCompilation/testassets/ApplicationUsingRelativePaths/Program.cs diff --git a/src/MvcPrecompilation/testapps/ApplicationUsingRelativePaths/Startup.cs b/src/Mvc/ViewCompilation/testassets/ApplicationUsingRelativePaths/Startup.cs similarity index 100% rename from src/MvcPrecompilation/testapps/ApplicationUsingRelativePaths/Startup.cs rename to src/Mvc/ViewCompilation/testassets/ApplicationUsingRelativePaths/Startup.cs diff --git a/src/MvcPrecompilation/testapps/ApplicationUsingRelativePaths/Views/Home/About.cshtml b/src/Mvc/ViewCompilation/testassets/ApplicationUsingRelativePaths/Views/Home/About.cshtml similarity index 100% rename from src/MvcPrecompilation/testapps/ApplicationUsingRelativePaths/Views/Home/About.cshtml rename to src/Mvc/ViewCompilation/testassets/ApplicationUsingRelativePaths/Views/Home/About.cshtml diff --git a/src/MvcPrecompilation/testapps/ApplicationUsingRelativePaths/Views/Home/Index.cshtml b/src/Mvc/ViewCompilation/testassets/ApplicationUsingRelativePaths/Views/Home/Index.cshtml similarity index 100% rename from src/MvcPrecompilation/testapps/ApplicationUsingRelativePaths/Views/Home/Index.cshtml rename to src/Mvc/ViewCompilation/testassets/ApplicationUsingRelativePaths/Views/Home/Index.cshtml diff --git a/src/MvcPrecompilation/testapps/ApplicationUsingRelativePaths/Views/Shared/_Layout.cshtml b/src/Mvc/ViewCompilation/testassets/ApplicationUsingRelativePaths/Views/Shared/_Layout.cshtml similarity index 100% rename from src/MvcPrecompilation/testapps/ApplicationUsingRelativePaths/Views/Shared/_Layout.cshtml rename to src/Mvc/ViewCompilation/testassets/ApplicationUsingRelativePaths/Views/Shared/_Layout.cshtml diff --git a/src/MvcPrecompilation/testapps/ApplicationUsingRelativePaths/Views/_ViewImports.cshtml b/src/Mvc/ViewCompilation/testassets/ApplicationUsingRelativePaths/Views/_ViewImports.cshtml similarity index 100% rename from src/MvcPrecompilation/testapps/ApplicationUsingRelativePaths/Views/_ViewImports.cshtml rename to src/Mvc/ViewCompilation/testassets/ApplicationUsingRelativePaths/Views/_ViewImports.cshtml diff --git a/src/MvcPrecompilation/testapps/ApplicationUsingRelativePaths/Views/_ViewStart.cshtml b/src/Mvc/ViewCompilation/testassets/ApplicationUsingRelativePaths/Views/_ViewStart.cshtml similarity index 100% rename from src/MvcPrecompilation/testapps/ApplicationUsingRelativePaths/Views/_ViewStart.cshtml rename to src/Mvc/ViewCompilation/testassets/ApplicationUsingRelativePaths/Views/_ViewStart.cshtml diff --git a/src/Mvc/ViewCompilation/testassets/ApplicationWithConfigureMvc/ApplicationWithConfigureMvc.csproj b/src/Mvc/ViewCompilation/testassets/ApplicationWithConfigureMvc/ApplicationWithConfigureMvc.csproj new file mode 100644 index 0000000000..e65a851293 --- /dev/null +++ b/src/Mvc/ViewCompilation/testassets/ApplicationWithConfigureMvc/ApplicationWithConfigureMvc.csproj @@ -0,0 +1,17 @@ + + + + netcoreapp2.1;net461 + $(DefineConstants);TEST123 + + true + + + + + + + + + + diff --git a/src/MvcPrecompilation/testapps/ApplicationWithConfigureMvc/Controllers/HomeController.cs b/src/Mvc/ViewCompilation/testassets/ApplicationWithConfigureMvc/Controllers/HomeController.cs similarity index 100% rename from src/MvcPrecompilation/testapps/ApplicationWithConfigureMvc/Controllers/HomeController.cs rename to src/Mvc/ViewCompilation/testassets/ApplicationWithConfigureMvc/Controllers/HomeController.cs diff --git a/src/MvcPrecompilation/testapps/ApplicationWithConfigureMvc/Program.cs b/src/Mvc/ViewCompilation/testassets/ApplicationWithConfigureMvc/Program.cs similarity index 100% rename from src/MvcPrecompilation/testapps/ApplicationWithConfigureMvc/Program.cs rename to src/Mvc/ViewCompilation/testassets/ApplicationWithConfigureMvc/Program.cs diff --git a/src/MvcPrecompilation/testapps/ApplicationWithConfigureMvc/RazorRewriter.cs b/src/Mvc/ViewCompilation/testassets/ApplicationWithConfigureMvc/RazorRewriter.cs similarity index 100% rename from src/MvcPrecompilation/testapps/ApplicationWithConfigureMvc/RazorRewriter.cs rename to src/Mvc/ViewCompilation/testassets/ApplicationWithConfigureMvc/RazorRewriter.cs diff --git a/src/MvcPrecompilation/testapps/ApplicationWithConfigureMvc/Startup.cs b/src/Mvc/ViewCompilation/testassets/ApplicationWithConfigureMvc/Startup.cs similarity index 100% rename from src/MvcPrecompilation/testapps/ApplicationWithConfigureMvc/Startup.cs rename to src/Mvc/ViewCompilation/testassets/ApplicationWithConfigureMvc/Startup.cs diff --git a/src/MvcPrecompilation/testapps/ApplicationWithConfigureMvc/Views/Home/Index.cshtml b/src/Mvc/ViewCompilation/testassets/ApplicationWithConfigureMvc/Views/Home/Index.cshtml similarity index 100% rename from src/MvcPrecompilation/testapps/ApplicationWithConfigureMvc/Views/Home/Index.cshtml rename to src/Mvc/ViewCompilation/testassets/ApplicationWithConfigureMvc/Views/Home/Index.cshtml diff --git a/src/MvcPrecompilation/testapps/ApplicationWithConfigureMvc/Views/Home/ViewWithPreprocessor.cshtml b/src/Mvc/ViewCompilation/testassets/ApplicationWithConfigureMvc/Views/Home/ViewWithPreprocessor.cshtml similarity index 100% rename from src/MvcPrecompilation/testapps/ApplicationWithConfigureMvc/Views/Home/ViewWithPreprocessor.cshtml rename to src/Mvc/ViewCompilation/testassets/ApplicationWithConfigureMvc/Views/Home/ViewWithPreprocessor.cshtml diff --git a/src/Mvc/ViewCompilation/testassets/ApplicationWithCustomInputFiles/ApplicationWithCustomInputFiles.csproj b/src/Mvc/ViewCompilation/testassets/ApplicationWithCustomInputFiles/ApplicationWithCustomInputFiles.csproj new file mode 100644 index 0000000000..b7783e1836 --- /dev/null +++ b/src/Mvc/ViewCompilation/testassets/ApplicationWithCustomInputFiles/ApplicationWithCustomInputFiles.csproj @@ -0,0 +1,21 @@ + + + + netcoreapp2.1;net461 + + true + true + + + + + + + + + + + + + + diff --git a/src/MvcPrecompilation/testapps/ApplicationWithCustomInputFiles/Controllers/HomeController.cs b/src/Mvc/ViewCompilation/testassets/ApplicationWithCustomInputFiles/Controllers/HomeController.cs similarity index 100% rename from src/MvcPrecompilation/testapps/ApplicationWithCustomInputFiles/Controllers/HomeController.cs rename to src/Mvc/ViewCompilation/testassets/ApplicationWithCustomInputFiles/Controllers/HomeController.cs diff --git a/src/MvcPrecompilation/testapps/ApplicationWithCustomInputFiles/Program.cs b/src/Mvc/ViewCompilation/testassets/ApplicationWithCustomInputFiles/Program.cs similarity index 100% rename from src/MvcPrecompilation/testapps/ApplicationWithCustomInputFiles/Program.cs rename to src/Mvc/ViewCompilation/testassets/ApplicationWithCustomInputFiles/Program.cs diff --git a/src/MvcPrecompilation/testapps/ApplicationWithCustomInputFiles/Startup.cs b/src/Mvc/ViewCompilation/testassets/ApplicationWithCustomInputFiles/Startup.cs similarity index 100% rename from src/MvcPrecompilation/testapps/ApplicationWithCustomInputFiles/Startup.cs rename to src/Mvc/ViewCompilation/testassets/ApplicationWithCustomInputFiles/Startup.cs diff --git a/src/MvcPrecompilation/testapps/ApplicationWithCustomInputFiles/Views/Home/About.cshtml b/src/Mvc/ViewCompilation/testassets/ApplicationWithCustomInputFiles/Views/Home/About.cshtml similarity index 100% rename from src/MvcPrecompilation/testapps/ApplicationWithCustomInputFiles/Views/Home/About.cshtml rename to src/Mvc/ViewCompilation/testassets/ApplicationWithCustomInputFiles/Views/Home/About.cshtml diff --git a/src/MvcPrecompilation/testapps/ApplicationWithCustomInputFiles/Views/Home/Index.cshtml b/src/Mvc/ViewCompilation/testassets/ApplicationWithCustomInputFiles/Views/Home/Index.cshtml similarity index 100% rename from src/MvcPrecompilation/testapps/ApplicationWithCustomInputFiles/Views/Home/Index.cshtml rename to src/Mvc/ViewCompilation/testassets/ApplicationWithCustomInputFiles/Views/Home/Index.cshtml diff --git a/src/MvcPrecompilation/testapps/ApplicationWithCustomInputFiles/Views/Home/NotIncluded.cshtml b/src/Mvc/ViewCompilation/testassets/ApplicationWithCustomInputFiles/Views/Home/NotIncluded.cshtml similarity index 100% rename from src/MvcPrecompilation/testapps/ApplicationWithCustomInputFiles/Views/Home/NotIncluded.cshtml rename to src/Mvc/ViewCompilation/testassets/ApplicationWithCustomInputFiles/Views/Home/NotIncluded.cshtml diff --git a/src/Mvc/ViewCompilation/testassets/ApplicationWithParseErrors/ApplicationWithParseErrors.csproj b/src/Mvc/ViewCompilation/testassets/ApplicationWithParseErrors/ApplicationWithParseErrors.csproj new file mode 100644 index 0000000000..3540ab1a64 --- /dev/null +++ b/src/Mvc/ViewCompilation/testassets/ApplicationWithParseErrors/ApplicationWithParseErrors.csproj @@ -0,0 +1,16 @@ + + + + netcoreapp2.1;net461 + + true + + + + + + + + + + diff --git a/src/MvcPrecompilation/testapps/ApplicationWithParseErrors/Program.cs b/src/Mvc/ViewCompilation/testassets/ApplicationWithParseErrors/Program.cs similarity index 100% rename from src/MvcPrecompilation/testapps/ApplicationWithParseErrors/Program.cs rename to src/Mvc/ViewCompilation/testassets/ApplicationWithParseErrors/Program.cs diff --git a/src/MvcPrecompilation/testapps/ApplicationWithParseErrors/Startup.cs b/src/Mvc/ViewCompilation/testassets/ApplicationWithParseErrors/Startup.cs similarity index 100% rename from src/MvcPrecompilation/testapps/ApplicationWithParseErrors/Startup.cs rename to src/Mvc/ViewCompilation/testassets/ApplicationWithParseErrors/Startup.cs diff --git a/src/MvcPrecompilation/testapps/ApplicationWithParseErrors/Views/Home/About.cshtml b/src/Mvc/ViewCompilation/testassets/ApplicationWithParseErrors/Views/Home/About.cshtml similarity index 100% rename from src/MvcPrecompilation/testapps/ApplicationWithParseErrors/Views/Home/About.cshtml rename to src/Mvc/ViewCompilation/testassets/ApplicationWithParseErrors/Views/Home/About.cshtml diff --git a/src/MvcPrecompilation/testapps/ApplicationWithParseErrors/Views/Home/Index.cshtml b/src/Mvc/ViewCompilation/testassets/ApplicationWithParseErrors/Views/Home/Index.cshtml similarity index 100% rename from src/MvcPrecompilation/testapps/ApplicationWithParseErrors/Views/Home/Index.cshtml rename to src/Mvc/ViewCompilation/testassets/ApplicationWithParseErrors/Views/Home/Index.cshtml diff --git a/src/Mvc/ViewCompilation/testassets/ApplicationWithRazorSdkNeitherUsed/ApplicationWithRazorSdkNeitherUsed.csproj b/src/Mvc/ViewCompilation/testassets/ApplicationWithRazorSdkNeitherUsed/ApplicationWithRazorSdkNeitherUsed.csproj new file mode 100644 index 0000000000..bb2dbbdd1a --- /dev/null +++ b/src/Mvc/ViewCompilation/testassets/ApplicationWithRazorSdkNeitherUsed/ApplicationWithRazorSdkNeitherUsed.csproj @@ -0,0 +1,19 @@ + + + + netcoreapp2.1;net461 + + + false + + + + + + + + + + diff --git a/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkNeitherUsed/Controllers/HomeController.cs b/src/Mvc/ViewCompilation/testassets/ApplicationWithRazorSdkNeitherUsed/Controllers/HomeController.cs similarity index 100% rename from src/MvcPrecompilation/testapps/ApplicationWithRazorSdkNeitherUsed/Controllers/HomeController.cs rename to src/Mvc/ViewCompilation/testassets/ApplicationWithRazorSdkNeitherUsed/Controllers/HomeController.cs diff --git a/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkNeitherUsed/Program.cs b/src/Mvc/ViewCompilation/testassets/ApplicationWithRazorSdkNeitherUsed/Program.cs similarity index 100% rename from src/MvcPrecompilation/testapps/ApplicationWithRazorSdkNeitherUsed/Program.cs rename to src/Mvc/ViewCompilation/testassets/ApplicationWithRazorSdkNeitherUsed/Program.cs diff --git a/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkNeitherUsed/Startup.cs b/src/Mvc/ViewCompilation/testassets/ApplicationWithRazorSdkNeitherUsed/Startup.cs similarity index 100% rename from src/MvcPrecompilation/testapps/ApplicationWithRazorSdkNeitherUsed/Startup.cs rename to src/Mvc/ViewCompilation/testassets/ApplicationWithRazorSdkNeitherUsed/Startup.cs diff --git a/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkNeitherUsed/Views/Home/About.cshtml b/src/Mvc/ViewCompilation/testassets/ApplicationWithRazorSdkNeitherUsed/Views/Home/About.cshtml similarity index 100% rename from src/MvcPrecompilation/testapps/ApplicationWithRazorSdkNeitherUsed/Views/Home/About.cshtml rename to src/Mvc/ViewCompilation/testassets/ApplicationWithRazorSdkNeitherUsed/Views/Home/About.cshtml diff --git a/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkNeitherUsed/Views/Home/Index.cshtml b/src/Mvc/ViewCompilation/testassets/ApplicationWithRazorSdkNeitherUsed/Views/Home/Index.cshtml similarity index 100% rename from src/MvcPrecompilation/testapps/ApplicationWithRazorSdkNeitherUsed/Views/Home/Index.cshtml rename to src/Mvc/ViewCompilation/testassets/ApplicationWithRazorSdkNeitherUsed/Views/Home/Index.cshtml diff --git a/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkNeitherUsed/Views/Shared/_Layout.cshtml b/src/Mvc/ViewCompilation/testassets/ApplicationWithRazorSdkNeitherUsed/Views/Shared/_Layout.cshtml similarity index 100% rename from src/MvcPrecompilation/testapps/ApplicationWithRazorSdkNeitherUsed/Views/Shared/_Layout.cshtml rename to src/Mvc/ViewCompilation/testassets/ApplicationWithRazorSdkNeitherUsed/Views/Shared/_Layout.cshtml diff --git a/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkNeitherUsed/Views/_ViewImports.cshtml b/src/Mvc/ViewCompilation/testassets/ApplicationWithRazorSdkNeitherUsed/Views/_ViewImports.cshtml similarity index 100% rename from src/MvcPrecompilation/testapps/ApplicationWithRazorSdkNeitherUsed/Views/_ViewImports.cshtml rename to src/Mvc/ViewCompilation/testassets/ApplicationWithRazorSdkNeitherUsed/Views/_ViewImports.cshtml diff --git a/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkNeitherUsed/Views/_ViewStart.cshtml b/src/Mvc/ViewCompilation/testassets/ApplicationWithRazorSdkNeitherUsed/Views/_ViewStart.cshtml similarity index 100% rename from src/MvcPrecompilation/testapps/ApplicationWithRazorSdkNeitherUsed/Views/_ViewStart.cshtml rename to src/Mvc/ViewCompilation/testassets/ApplicationWithRazorSdkNeitherUsed/Views/_ViewStart.cshtml diff --git a/src/Mvc/ViewCompilation/testassets/ApplicationWithRazorSdkPrecompilationUsed/ApplicationWithRazorSdkPrecompilationUsed.csproj b/src/Mvc/ViewCompilation/testassets/ApplicationWithRazorSdkPrecompilationUsed/ApplicationWithRazorSdkPrecompilationUsed.csproj new file mode 100644 index 0000000000..5fa1eb96b0 --- /dev/null +++ b/src/Mvc/ViewCompilation/testassets/ApplicationWithRazorSdkPrecompilationUsed/ApplicationWithRazorSdkPrecompilationUsed.csproj @@ -0,0 +1,19 @@ + + + + netcoreapp2.1;net461 + + + true + + + + + + + + + + diff --git a/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkPrecompilationUsed/Controllers/HomeController.cs b/src/Mvc/ViewCompilation/testassets/ApplicationWithRazorSdkPrecompilationUsed/Controllers/HomeController.cs similarity index 100% rename from src/MvcPrecompilation/testapps/ApplicationWithRazorSdkPrecompilationUsed/Controllers/HomeController.cs rename to src/Mvc/ViewCompilation/testassets/ApplicationWithRazorSdkPrecompilationUsed/Controllers/HomeController.cs diff --git a/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkPrecompilationUsed/Program.cs b/src/Mvc/ViewCompilation/testassets/ApplicationWithRazorSdkPrecompilationUsed/Program.cs similarity index 100% rename from src/MvcPrecompilation/testapps/ApplicationWithRazorSdkPrecompilationUsed/Program.cs rename to src/Mvc/ViewCompilation/testassets/ApplicationWithRazorSdkPrecompilationUsed/Program.cs diff --git a/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkPrecompilationUsed/Startup.cs b/src/Mvc/ViewCompilation/testassets/ApplicationWithRazorSdkPrecompilationUsed/Startup.cs similarity index 100% rename from src/MvcPrecompilation/testapps/ApplicationWithRazorSdkPrecompilationUsed/Startup.cs rename to src/Mvc/ViewCompilation/testassets/ApplicationWithRazorSdkPrecompilationUsed/Startup.cs diff --git a/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkPrecompilationUsed/Views/Home/About.cshtml b/src/Mvc/ViewCompilation/testassets/ApplicationWithRazorSdkPrecompilationUsed/Views/Home/About.cshtml similarity index 100% rename from src/MvcPrecompilation/testapps/ApplicationWithRazorSdkPrecompilationUsed/Views/Home/About.cshtml rename to src/Mvc/ViewCompilation/testassets/ApplicationWithRazorSdkPrecompilationUsed/Views/Home/About.cshtml diff --git a/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkPrecompilationUsed/Views/Home/Index.cshtml b/src/Mvc/ViewCompilation/testassets/ApplicationWithRazorSdkPrecompilationUsed/Views/Home/Index.cshtml similarity index 100% rename from src/MvcPrecompilation/testapps/ApplicationWithRazorSdkPrecompilationUsed/Views/Home/Index.cshtml rename to src/Mvc/ViewCompilation/testassets/ApplicationWithRazorSdkPrecompilationUsed/Views/Home/Index.cshtml diff --git a/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkPrecompilationUsed/Views/Shared/_Layout.cshtml b/src/Mvc/ViewCompilation/testassets/ApplicationWithRazorSdkPrecompilationUsed/Views/Shared/_Layout.cshtml similarity index 100% rename from src/MvcPrecompilation/testapps/ApplicationWithRazorSdkPrecompilationUsed/Views/Shared/_Layout.cshtml rename to src/Mvc/ViewCompilation/testassets/ApplicationWithRazorSdkPrecompilationUsed/Views/Shared/_Layout.cshtml diff --git a/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkPrecompilationUsed/Views/_ViewImports.cshtml b/src/Mvc/ViewCompilation/testassets/ApplicationWithRazorSdkPrecompilationUsed/Views/_ViewImports.cshtml similarity index 100% rename from src/MvcPrecompilation/testapps/ApplicationWithRazorSdkPrecompilationUsed/Views/_ViewImports.cshtml rename to src/Mvc/ViewCompilation/testassets/ApplicationWithRazorSdkPrecompilationUsed/Views/_ViewImports.cshtml diff --git a/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkPrecompilationUsed/Views/_ViewStart.cshtml b/src/Mvc/ViewCompilation/testassets/ApplicationWithRazorSdkPrecompilationUsed/Views/_ViewStart.cshtml similarity index 100% rename from src/MvcPrecompilation/testapps/ApplicationWithRazorSdkPrecompilationUsed/Views/_ViewStart.cshtml rename to src/Mvc/ViewCompilation/testassets/ApplicationWithRazorSdkPrecompilationUsed/Views/_ViewStart.cshtml diff --git a/src/Mvc/ViewCompilation/testassets/ApplicationWithRazorSdkUsed/ApplicationWithRazorSdkUsed.csproj b/src/Mvc/ViewCompilation/testassets/ApplicationWithRazorSdkUsed/ApplicationWithRazorSdkUsed.csproj new file mode 100644 index 0000000000..026200aeca --- /dev/null +++ b/src/Mvc/ViewCompilation/testassets/ApplicationWithRazorSdkUsed/ApplicationWithRazorSdkUsed.csproj @@ -0,0 +1,14 @@ + + + + netcoreapp2.1;net461 + + + + + + + + + + diff --git a/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkUsed/Controllers/HomeController.cs b/src/Mvc/ViewCompilation/testassets/ApplicationWithRazorSdkUsed/Controllers/HomeController.cs similarity index 100% rename from src/MvcPrecompilation/testapps/ApplicationWithRazorSdkUsed/Controllers/HomeController.cs rename to src/Mvc/ViewCompilation/testassets/ApplicationWithRazorSdkUsed/Controllers/HomeController.cs diff --git a/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkUsed/Program.cs b/src/Mvc/ViewCompilation/testassets/ApplicationWithRazorSdkUsed/Program.cs similarity index 100% rename from src/MvcPrecompilation/testapps/ApplicationWithRazorSdkUsed/Program.cs rename to src/Mvc/ViewCompilation/testassets/ApplicationWithRazorSdkUsed/Program.cs diff --git a/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkUsed/Startup.cs b/src/Mvc/ViewCompilation/testassets/ApplicationWithRazorSdkUsed/Startup.cs similarity index 100% rename from src/MvcPrecompilation/testapps/ApplicationWithRazorSdkUsed/Startup.cs rename to src/Mvc/ViewCompilation/testassets/ApplicationWithRazorSdkUsed/Startup.cs diff --git a/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkUsed/Views/Home/About.cshtml b/src/Mvc/ViewCompilation/testassets/ApplicationWithRazorSdkUsed/Views/Home/About.cshtml similarity index 100% rename from src/MvcPrecompilation/testapps/ApplicationWithRazorSdkUsed/Views/Home/About.cshtml rename to src/Mvc/ViewCompilation/testassets/ApplicationWithRazorSdkUsed/Views/Home/About.cshtml diff --git a/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkUsed/Views/Home/Index.cshtml b/src/Mvc/ViewCompilation/testassets/ApplicationWithRazorSdkUsed/Views/Home/Index.cshtml similarity index 100% rename from src/MvcPrecompilation/testapps/ApplicationWithRazorSdkUsed/Views/Home/Index.cshtml rename to src/Mvc/ViewCompilation/testassets/ApplicationWithRazorSdkUsed/Views/Home/Index.cshtml diff --git a/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkUsed/Views/Shared/_Layout.cshtml b/src/Mvc/ViewCompilation/testassets/ApplicationWithRazorSdkUsed/Views/Shared/_Layout.cshtml similarity index 100% rename from src/MvcPrecompilation/testapps/ApplicationWithRazorSdkUsed/Views/Shared/_Layout.cshtml rename to src/Mvc/ViewCompilation/testassets/ApplicationWithRazorSdkUsed/Views/Shared/_Layout.cshtml diff --git a/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkUsed/Views/_ViewImports.cshtml b/src/Mvc/ViewCompilation/testassets/ApplicationWithRazorSdkUsed/Views/_ViewImports.cshtml similarity index 100% rename from src/MvcPrecompilation/testapps/ApplicationWithRazorSdkUsed/Views/_ViewImports.cshtml rename to src/Mvc/ViewCompilation/testassets/ApplicationWithRazorSdkUsed/Views/_ViewImports.cshtml diff --git a/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkUsed/Views/_ViewStart.cshtml b/src/Mvc/ViewCompilation/testassets/ApplicationWithRazorSdkUsed/Views/_ViewStart.cshtml similarity index 100% rename from src/MvcPrecompilation/testapps/ApplicationWithRazorSdkUsed/Views/_ViewStart.cshtml rename to src/Mvc/ViewCompilation/testassets/ApplicationWithRazorSdkUsed/Views/_ViewStart.cshtml diff --git a/src/Mvc/ViewCompilation/testassets/ApplicationWithTagHelpers/ApplicationWithTagHelpers.csproj b/src/Mvc/ViewCompilation/testassets/ApplicationWithTagHelpers/ApplicationWithTagHelpers.csproj new file mode 100644 index 0000000000..7d900f0b04 --- /dev/null +++ b/src/Mvc/ViewCompilation/testassets/ApplicationWithTagHelpers/ApplicationWithTagHelpers.csproj @@ -0,0 +1,20 @@ + + + + netcoreapp2.1;net461 + + true + + + + + + + + + + + + + + diff --git a/src/MvcPrecompilation/testapps/ApplicationWithTagHelpers/Components/CopyrightViewComponent.cs b/src/Mvc/ViewCompilation/testassets/ApplicationWithTagHelpers/Components/CopyrightViewComponent.cs similarity index 100% rename from src/MvcPrecompilation/testapps/ApplicationWithTagHelpers/Components/CopyrightViewComponent.cs rename to src/Mvc/ViewCompilation/testassets/ApplicationWithTagHelpers/Components/CopyrightViewComponent.cs diff --git a/src/MvcPrecompilation/testapps/ApplicationWithTagHelpers/Controllers/HomeController.cs b/src/Mvc/ViewCompilation/testassets/ApplicationWithTagHelpers/Controllers/HomeController.cs similarity index 100% rename from src/MvcPrecompilation/testapps/ApplicationWithTagHelpers/Controllers/HomeController.cs rename to src/Mvc/ViewCompilation/testassets/ApplicationWithTagHelpers/Controllers/HomeController.cs diff --git a/src/MvcPrecompilation/testapps/ApplicationWithTagHelpers/Program.cs b/src/Mvc/ViewCompilation/testassets/ApplicationWithTagHelpers/Program.cs similarity index 100% rename from src/MvcPrecompilation/testapps/ApplicationWithTagHelpers/Program.cs rename to src/Mvc/ViewCompilation/testassets/ApplicationWithTagHelpers/Program.cs diff --git a/src/MvcPrecompilation/testapps/ApplicationWithTagHelpers/Startup.cs b/src/Mvc/ViewCompilation/testassets/ApplicationWithTagHelpers/Startup.cs similarity index 100% rename from src/MvcPrecompilation/testapps/ApplicationWithTagHelpers/Startup.cs rename to src/Mvc/ViewCompilation/testassets/ApplicationWithTagHelpers/Startup.cs diff --git a/src/MvcPrecompilation/testapps/ApplicationWithTagHelpers/TagHelpers/TestTagHelper.cs b/src/Mvc/ViewCompilation/testassets/ApplicationWithTagHelpers/TagHelpers/TestTagHelper.cs similarity index 100% rename from src/MvcPrecompilation/testapps/ApplicationWithTagHelpers/TagHelpers/TestTagHelper.cs rename to src/Mvc/ViewCompilation/testassets/ApplicationWithTagHelpers/TagHelpers/TestTagHelper.cs diff --git a/src/MvcPrecompilation/testapps/ApplicationWithTagHelpers/Views/Home/ClassLibraryTagHelper.cshtml b/src/Mvc/ViewCompilation/testassets/ApplicationWithTagHelpers/Views/Home/ClassLibraryTagHelper.cshtml similarity index 100% rename from src/MvcPrecompilation/testapps/ApplicationWithTagHelpers/Views/Home/ClassLibraryTagHelper.cshtml rename to src/Mvc/ViewCompilation/testassets/ApplicationWithTagHelpers/Views/Home/ClassLibraryTagHelper.cshtml diff --git a/src/MvcPrecompilation/testapps/ApplicationWithTagHelpers/Views/Home/LocalTagHelper.cshtml b/src/Mvc/ViewCompilation/testassets/ApplicationWithTagHelpers/Views/Home/LocalTagHelper.cshtml similarity index 100% rename from src/MvcPrecompilation/testapps/ApplicationWithTagHelpers/Views/Home/LocalTagHelper.cshtml rename to src/Mvc/ViewCompilation/testassets/ApplicationWithTagHelpers/Views/Home/LocalTagHelper.cshtml diff --git a/src/MvcPrecompilation/testapps/ApplicationWithTagHelpers/Views/Shared/Components/Copyright/Default.cshtml b/src/Mvc/ViewCompilation/testassets/ApplicationWithTagHelpers/Views/Shared/Components/Copyright/Default.cshtml similarity index 100% rename from src/MvcPrecompilation/testapps/ApplicationWithTagHelpers/Views/Shared/Components/Copyright/Default.cshtml rename to src/Mvc/ViewCompilation/testassets/ApplicationWithTagHelpers/Views/Shared/Components/Copyright/Default.cshtml diff --git a/src/MvcPrecompilation/testapps/ApplicationWithTagHelpers/Views/Shared/_Layout.cshtml b/src/Mvc/ViewCompilation/testassets/ApplicationWithTagHelpers/Views/Shared/_Layout.cshtml similarity index 100% rename from src/MvcPrecompilation/testapps/ApplicationWithTagHelpers/Views/Shared/_Layout.cshtml rename to src/Mvc/ViewCompilation/testassets/ApplicationWithTagHelpers/Views/Shared/_Layout.cshtml diff --git a/src/MvcPrecompilation/testapps/ApplicationWithTagHelpers/Views/_ViewImports.cshtml b/src/Mvc/ViewCompilation/testassets/ApplicationWithTagHelpers/Views/_ViewImports.cshtml similarity index 100% rename from src/MvcPrecompilation/testapps/ApplicationWithTagHelpers/Views/_ViewImports.cshtml rename to src/Mvc/ViewCompilation/testassets/ApplicationWithTagHelpers/Views/_ViewImports.cshtml diff --git a/src/MvcPrecompilation/testapps/ApplicationWithTagHelpers/Views/_ViewStart.cshtml b/src/Mvc/ViewCompilation/testassets/ApplicationWithTagHelpers/Views/_ViewStart.cshtml similarity index 100% rename from src/MvcPrecompilation/testapps/ApplicationWithTagHelpers/Views/_ViewStart.cshtml rename to src/Mvc/ViewCompilation/testassets/ApplicationWithTagHelpers/Views/_ViewStart.cshtml diff --git a/src/MvcPrecompilation/testapps/ClassLibraryTagHelper/BoldTagHelper.cs b/src/Mvc/ViewCompilation/testassets/ClassLibraryTagHelper/BoldTagHelper.cs similarity index 100% rename from src/MvcPrecompilation/testapps/ClassLibraryTagHelper/BoldTagHelper.cs rename to src/Mvc/ViewCompilation/testassets/ClassLibraryTagHelper/BoldTagHelper.cs diff --git a/src/MvcPrecompilation/testapps/ClassLibraryTagHelper/ClassLibraryTagHelper.csproj b/src/Mvc/ViewCompilation/testassets/ClassLibraryTagHelper/ClassLibraryTagHelper.csproj similarity index 57% rename from src/MvcPrecompilation/testapps/ClassLibraryTagHelper/ClassLibraryTagHelper.csproj rename to src/Mvc/ViewCompilation/testassets/ClassLibraryTagHelper/ClassLibraryTagHelper.csproj index 309df3008e..2963d6919b 100644 --- a/src/MvcPrecompilation/testapps/ClassLibraryTagHelper/ClassLibraryTagHelper.csproj +++ b/src/Mvc/ViewCompilation/testassets/ClassLibraryTagHelper/ClassLibraryTagHelper.csproj @@ -5,7 +5,7 @@ - + diff --git a/src/MvcPrecompilation/testapps/Directory.Build.props b/src/Mvc/ViewCompilation/testassets/Directory.Build.props similarity index 65% rename from src/MvcPrecompilation/testapps/Directory.Build.props rename to src/Mvc/ViewCompilation/testassets/Directory.Build.props index 165d1dd384..8f4034fc3f 100644 --- a/src/MvcPrecompilation/testapps/Directory.Build.props +++ b/src/Mvc/ViewCompilation/testassets/Directory.Build.props @@ -1,5 +1,5 @@ - + diff --git a/src/MvcPrecompilation/testapps/Directory.Build.targets b/src/Mvc/ViewCompilation/testassets/Directory.Build.targets similarity index 51% rename from src/MvcPrecompilation/testapps/Directory.Build.targets rename to src/Mvc/ViewCompilation/testassets/Directory.Build.targets index 4b805513d6..901bbe4f9b 100644 --- a/src/MvcPrecompilation/testapps/Directory.Build.targets +++ b/src/Mvc/ViewCompilation/testassets/Directory.Build.targets @@ -1,14 +1,14 @@ - + <_MvcViewCompilationAddDesktopReferences>false $(MvcRazorCompileOnPublish) $(Configuration) - <_MvcViewCompilationTasksPath>$(MSBuildThisFileDirectory)..\src\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tasks\bin\$(SolutionConfiguration)\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tasks.dll + <_MvcViewCompilationTasksPath>$(MSBuildThisFileDirectory)..\..\ViewCompilation.Tasks\bin\$(SolutionConfiguration)\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tasks.dll - - <_MvcViewCompilationBinaryPath Condition="'$(TargetFramework)'!='net461'">$(MSBuildThisFileDirectory)..\src\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation\bin\$(SolutionConfiguration)\netcoreapp2.0\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.dll - <_MvcViewCompilationBinaryPath Condition="'$(TargetFramework)'=='net461'">$(MSBuildThisFileDirectory)..\src\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation\bin\$(SolutionConfiguration)\net461\win7-x86\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation-x86.exe + <_MvcViewCompilationBinaryPath Condition="'$(TargetFramework)'!='net461'">$(MSBuildThisFileDirectory)..\src\bin\$(SolutionConfiguration)\netcoreapp2.0\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.dll + <_MvcViewCompilationBinaryPath Condition="'$(TargetFramework)'=='net461'">$(MSBuildThisFileDirectory)..\src\bin\$(SolutionConfiguration)\net461\win7-x86\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation-x86.exe diff --git a/src/MvcPrecompilation/testapps/PublishWithEmbedViewSources/Areas/TestArea/Views/Home/Index.cshtml b/src/Mvc/ViewCompilation/testassets/PublishWithEmbedViewSources/Areas/TestArea/Views/Home/Index.cshtml similarity index 100% rename from src/MvcPrecompilation/testapps/PublishWithEmbedViewSources/Areas/TestArea/Views/Home/Index.cshtml rename to src/Mvc/ViewCompilation/testassets/PublishWithEmbedViewSources/Areas/TestArea/Views/Home/Index.cshtml diff --git a/src/MvcPrecompilation/testapps/PublishWithEmbedViewSources/Controllers/HomeController.cs b/src/Mvc/ViewCompilation/testassets/PublishWithEmbedViewSources/Controllers/HomeController.cs similarity index 100% rename from src/MvcPrecompilation/testapps/PublishWithEmbedViewSources/Controllers/HomeController.cs rename to src/Mvc/ViewCompilation/testassets/PublishWithEmbedViewSources/Controllers/HomeController.cs diff --git a/src/MvcPrecompilation/testapps/PublishWithEmbedViewSources/Program.cs b/src/Mvc/ViewCompilation/testassets/PublishWithEmbedViewSources/Program.cs similarity index 100% rename from src/MvcPrecompilation/testapps/PublishWithEmbedViewSources/Program.cs rename to src/Mvc/ViewCompilation/testassets/PublishWithEmbedViewSources/Program.cs diff --git a/src/Mvc/ViewCompilation/testassets/PublishWithEmbedViewSources/PublishWithEmbedViewSources.csproj b/src/Mvc/ViewCompilation/testassets/PublishWithEmbedViewSources/PublishWithEmbedViewSources.csproj new file mode 100644 index 0000000000..b3c1d87bdd --- /dev/null +++ b/src/Mvc/ViewCompilation/testassets/PublishWithEmbedViewSources/PublishWithEmbedViewSources.csproj @@ -0,0 +1,17 @@ + + + + netcoreapp2.1;net461 + + true + true + + + + + + + + + + diff --git a/src/MvcPrecompilation/testapps/PublishWithEmbedViewSources/Startup.cs b/src/Mvc/ViewCompilation/testassets/PublishWithEmbedViewSources/Startup.cs similarity index 100% rename from src/MvcPrecompilation/testapps/PublishWithEmbedViewSources/Startup.cs rename to src/Mvc/ViewCompilation/testassets/PublishWithEmbedViewSources/Startup.cs diff --git a/src/MvcPrecompilation/testapps/PublishWithEmbedViewSources/Views/Home/About.cshtml b/src/Mvc/ViewCompilation/testassets/PublishWithEmbedViewSources/Views/Home/About.cshtml similarity index 100% rename from src/MvcPrecompilation/testapps/PublishWithEmbedViewSources/Views/Home/About.cshtml rename to src/Mvc/ViewCompilation/testassets/PublishWithEmbedViewSources/Views/Home/About.cshtml diff --git a/src/MvcPrecompilation/testapps/PublishWithEmbedViewSources/Views/Home/Index.cshtml b/src/Mvc/ViewCompilation/testassets/PublishWithEmbedViewSources/Views/Home/Index.cshtml similarity index 100% rename from src/MvcPrecompilation/testapps/PublishWithEmbedViewSources/Views/Home/Index.cshtml rename to src/Mvc/ViewCompilation/testassets/PublishWithEmbedViewSources/Views/Home/Index.cshtml diff --git a/src/MvcPrecompilation/testapps/RazorPagesApp/Pages/Auth/Index.cshtml b/src/Mvc/ViewCompilation/testassets/RazorPagesApp/Pages/Auth/Index.cshtml similarity index 100% rename from src/MvcPrecompilation/testapps/RazorPagesApp/Pages/Auth/Index.cshtml rename to src/Mvc/ViewCompilation/testassets/RazorPagesApp/Pages/Auth/Index.cshtml diff --git a/src/MvcPrecompilation/testapps/RazorPagesApp/Pages/Index.cshtml b/src/Mvc/ViewCompilation/testassets/RazorPagesApp/Pages/Index.cshtml similarity index 100% rename from src/MvcPrecompilation/testapps/RazorPagesApp/Pages/Index.cshtml rename to src/Mvc/ViewCompilation/testassets/RazorPagesApp/Pages/Index.cshtml diff --git a/src/MvcPrecompilation/testapps/RazorPagesApp/Pages/Login.cshtml b/src/Mvc/ViewCompilation/testassets/RazorPagesApp/Pages/Login.cshtml similarity index 100% rename from src/MvcPrecompilation/testapps/RazorPagesApp/Pages/Login.cshtml rename to src/Mvc/ViewCompilation/testassets/RazorPagesApp/Pages/Login.cshtml diff --git a/src/MvcPrecompilation/testapps/RazorPagesApp/Pages/MyPageModel.cs b/src/Mvc/ViewCompilation/testassets/RazorPagesApp/Pages/MyPageModel.cs similarity index 100% rename from src/MvcPrecompilation/testapps/RazorPagesApp/Pages/MyPageModel.cs rename to src/Mvc/ViewCompilation/testassets/RazorPagesApp/Pages/MyPageModel.cs diff --git a/src/MvcPrecompilation/testapps/RazorPagesApp/Pages/Nested1/Nested2/PageWithTagHelper.cshtml b/src/Mvc/ViewCompilation/testassets/RazorPagesApp/Pages/Nested1/Nested2/PageWithTagHelper.cshtml similarity index 100% rename from src/MvcPrecompilation/testapps/RazorPagesApp/Pages/Nested1/Nested2/PageWithTagHelper.cshtml rename to src/Mvc/ViewCompilation/testassets/RazorPagesApp/Pages/Nested1/Nested2/PageWithTagHelper.cshtml diff --git a/src/MvcPrecompilation/testapps/RazorPagesApp/Pages/Nested1/_ViewImports.cshtml b/src/Mvc/ViewCompilation/testassets/RazorPagesApp/Pages/Nested1/_ViewImports.cshtml similarity index 100% rename from src/MvcPrecompilation/testapps/RazorPagesApp/Pages/Nested1/_ViewImports.cshtml rename to src/Mvc/ViewCompilation/testassets/RazorPagesApp/Pages/Nested1/_ViewImports.cshtml diff --git a/src/MvcPrecompilation/testapps/RazorPagesApp/Pages/PageWithModel.cshtml b/src/Mvc/ViewCompilation/testassets/RazorPagesApp/Pages/PageWithModel.cshtml similarity index 100% rename from src/MvcPrecompilation/testapps/RazorPagesApp/Pages/PageWithModel.cshtml rename to src/Mvc/ViewCompilation/testassets/RazorPagesApp/Pages/PageWithModel.cshtml diff --git a/src/MvcPrecompilation/testapps/RazorPagesApp/Pages/PageWithRoute.cshtml b/src/Mvc/ViewCompilation/testassets/RazorPagesApp/Pages/PageWithRoute.cshtml similarity index 100% rename from src/MvcPrecompilation/testapps/RazorPagesApp/Pages/PageWithRoute.cshtml rename to src/Mvc/ViewCompilation/testassets/RazorPagesApp/Pages/PageWithRoute.cshtml diff --git a/src/MvcPrecompilation/testapps/RazorPagesApp/Pages/_PageStart.cshtml b/src/Mvc/ViewCompilation/testassets/RazorPagesApp/Pages/_PageStart.cshtml similarity index 100% rename from src/MvcPrecompilation/testapps/RazorPagesApp/Pages/_PageStart.cshtml rename to src/Mvc/ViewCompilation/testassets/RazorPagesApp/Pages/_PageStart.cshtml diff --git a/src/MvcPrecompilation/testapps/RazorPagesApp/Pages/_ViewImports.cshtml b/src/Mvc/ViewCompilation/testassets/RazorPagesApp/Pages/_ViewImports.cshtml similarity index 100% rename from src/MvcPrecompilation/testapps/RazorPagesApp/Pages/_ViewImports.cshtml rename to src/Mvc/ViewCompilation/testassets/RazorPagesApp/Pages/_ViewImports.cshtml diff --git a/src/MvcPrecompilation/testapps/RazorPagesApp/Program.cs b/src/Mvc/ViewCompilation/testassets/RazorPagesApp/Program.cs similarity index 100% rename from src/MvcPrecompilation/testapps/RazorPagesApp/Program.cs rename to src/Mvc/ViewCompilation/testassets/RazorPagesApp/Program.cs diff --git a/src/Mvc/ViewCompilation/testassets/RazorPagesApp/RazorPagesApp.csproj b/src/Mvc/ViewCompilation/testassets/RazorPagesApp/RazorPagesApp.csproj new file mode 100644 index 0000000000..4ee2d4a9e2 --- /dev/null +++ b/src/Mvc/ViewCompilation/testassets/RazorPagesApp/RazorPagesApp.csproj @@ -0,0 +1,17 @@ + + + + netcoreapp2.1;net461 + + true + + + + + + + + + + + diff --git a/src/MvcPrecompilation/testapps/RazorPagesApp/Startup.cs b/src/Mvc/ViewCompilation/testassets/RazorPagesApp/Startup.cs similarity index 100% rename from src/MvcPrecompilation/testapps/RazorPagesApp/Startup.cs rename to src/Mvc/ViewCompilation/testassets/RazorPagesApp/Startup.cs diff --git a/src/MvcPrecompilation/testapps/RazorPagesApp/Views/Shared/_Layout.cshtml b/src/Mvc/ViewCompilation/testassets/RazorPagesApp/Views/Shared/_Layout.cshtml similarity index 100% rename from src/MvcPrecompilation/testapps/RazorPagesApp/Views/Shared/_Layout.cshtml rename to src/Mvc/ViewCompilation/testassets/RazorPagesApp/Views/Shared/_Layout.cshtml diff --git a/src/MvcPrecompilation/testapps/SimpleApp/Controllers/HomeController.cs b/src/Mvc/ViewCompilation/testassets/SimpleApp/Controllers/HomeController.cs similarity index 100% rename from src/MvcPrecompilation/testapps/SimpleApp/Controllers/HomeController.cs rename to src/Mvc/ViewCompilation/testassets/SimpleApp/Controllers/HomeController.cs diff --git a/src/MvcPrecompilation/testapps/SimpleApp/Program.cs b/src/Mvc/ViewCompilation/testassets/SimpleApp/Program.cs similarity index 100% rename from src/MvcPrecompilation/testapps/SimpleApp/Program.cs rename to src/Mvc/ViewCompilation/testassets/SimpleApp/Program.cs diff --git a/src/Mvc/ViewCompilation/testassets/SimpleApp/SimpleApp.csproj b/src/Mvc/ViewCompilation/testassets/SimpleApp/SimpleApp.csproj new file mode 100644 index 0000000000..bb1e780913 --- /dev/null +++ b/src/Mvc/ViewCompilation/testassets/SimpleApp/SimpleApp.csproj @@ -0,0 +1,17 @@ + + + + netcoreapp2.1;net461 + win7-x86;debian-x64 + + true + + + + + + + + + + diff --git a/src/MvcPrecompilation/testapps/SimpleApp/Startup.cs b/src/Mvc/ViewCompilation/testassets/SimpleApp/Startup.cs similarity index 100% rename from src/MvcPrecompilation/testapps/SimpleApp/Startup.cs rename to src/Mvc/ViewCompilation/testassets/SimpleApp/Startup.cs diff --git a/src/MvcPrecompilation/testapps/SimpleApp/Views/Home/About.cshtml b/src/Mvc/ViewCompilation/testassets/SimpleApp/Views/Home/About.cshtml similarity index 100% rename from src/MvcPrecompilation/testapps/SimpleApp/Views/Home/About.cshtml rename to src/Mvc/ViewCompilation/testassets/SimpleApp/Views/Home/About.cshtml diff --git a/src/MvcPrecompilation/testapps/SimpleApp/Views/Home/Index.cshtml b/src/Mvc/ViewCompilation/testassets/SimpleApp/Views/Home/Index.cshtml similarity index 100% rename from src/MvcPrecompilation/testapps/SimpleApp/Views/Home/Index.cshtml rename to src/Mvc/ViewCompilation/testassets/SimpleApp/Views/Home/Index.cshtml diff --git a/src/MvcPrecompilation/testapps/SimpleApp/Views/Shared/_Layout.cshtml b/src/Mvc/ViewCompilation/testassets/SimpleApp/Views/Shared/_Layout.cshtml similarity index 100% rename from src/MvcPrecompilation/testapps/SimpleApp/Views/Shared/_Layout.cshtml rename to src/Mvc/ViewCompilation/testassets/SimpleApp/Views/Shared/_Layout.cshtml diff --git a/src/MvcPrecompilation/testapps/SimpleApp/Views/_ViewImports.cshtml b/src/Mvc/ViewCompilation/testassets/SimpleApp/Views/_ViewImports.cshtml similarity index 100% rename from src/MvcPrecompilation/testapps/SimpleApp/Views/_ViewImports.cshtml rename to src/Mvc/ViewCompilation/testassets/SimpleApp/Views/_ViewImports.cshtml diff --git a/src/MvcPrecompilation/testapps/SimpleApp/Views/_ViewStart.cshtml b/src/Mvc/ViewCompilation/testassets/SimpleApp/Views/_ViewStart.cshtml similarity index 100% rename from src/MvcPrecompilation/testapps/SimpleApp/Views/_ViewStart.cshtml rename to src/Mvc/ViewCompilation/testassets/SimpleApp/Views/_ViewStart.cshtml diff --git a/src/MvcPrecompilation/testapps/SimpleAppWithAssemblyRename/Controllers/HomeController.cs b/src/Mvc/ViewCompilation/testassets/SimpleAppWithAssemblyRename/Controllers/HomeController.cs similarity index 100% rename from src/MvcPrecompilation/testapps/SimpleAppWithAssemblyRename/Controllers/HomeController.cs rename to src/Mvc/ViewCompilation/testassets/SimpleAppWithAssemblyRename/Controllers/HomeController.cs diff --git a/src/MvcPrecompilation/testapps/SimpleAppWithAssemblyRename/Program.cs b/src/Mvc/ViewCompilation/testassets/SimpleAppWithAssemblyRename/Program.cs similarity index 100% rename from src/MvcPrecompilation/testapps/SimpleAppWithAssemblyRename/Program.cs rename to src/Mvc/ViewCompilation/testassets/SimpleAppWithAssemblyRename/Program.cs diff --git a/src/Mvc/ViewCompilation/testassets/SimpleAppWithAssemblyRename/SimpleAppWithAssemblyRename.csproj b/src/Mvc/ViewCompilation/testassets/SimpleAppWithAssemblyRename/SimpleAppWithAssemblyRename.csproj new file mode 100644 index 0000000000..146c7b1a80 --- /dev/null +++ b/src/Mvc/ViewCompilation/testassets/SimpleAppWithAssemblyRename/SimpleAppWithAssemblyRename.csproj @@ -0,0 +1,17 @@ + + + + NewAssemblyName + netcoreapp2.1;net461 + + true + + + + + + + + + + diff --git a/src/MvcPrecompilation/testapps/SimpleAppWithAssemblyRename/Startup.cs b/src/Mvc/ViewCompilation/testassets/SimpleAppWithAssemblyRename/Startup.cs similarity index 100% rename from src/MvcPrecompilation/testapps/SimpleAppWithAssemblyRename/Startup.cs rename to src/Mvc/ViewCompilation/testassets/SimpleAppWithAssemblyRename/Startup.cs diff --git a/src/MvcPrecompilation/testapps/SimpleAppWithAssemblyRename/Views/Home/Index.cshtml b/src/Mvc/ViewCompilation/testassets/SimpleAppWithAssemblyRename/Views/Home/Index.cshtml similarity index 100% rename from src/MvcPrecompilation/testapps/SimpleAppWithAssemblyRename/Views/Home/Index.cshtml rename to src/Mvc/ViewCompilation/testassets/SimpleAppWithAssemblyRename/Views/Home/Index.cshtml diff --git a/src/MvcPrecompilation/testapps/SimpleAppWithAssemblyRename/Views/_ViewImports.cshtml b/src/Mvc/ViewCompilation/testassets/SimpleAppWithAssemblyRename/Views/_ViewImports.cshtml similarity index 100% rename from src/MvcPrecompilation/testapps/SimpleAppWithAssemblyRename/Views/_ViewImports.cshtml rename to src/Mvc/ViewCompilation/testassets/SimpleAppWithAssemblyRename/Views/_ViewImports.cshtml diff --git a/src/MvcPrecompilation/testapps/StrongNamedApp/Controllers/HomeController.cs b/src/Mvc/ViewCompilation/testassets/StrongNamedApp/Controllers/HomeController.cs similarity index 100% rename from src/MvcPrecompilation/testapps/StrongNamedApp/Controllers/HomeController.cs rename to src/Mvc/ViewCompilation/testassets/StrongNamedApp/Controllers/HomeController.cs diff --git a/src/MvcPrecompilation/testapps/StrongNamedApp/Program.cs b/src/Mvc/ViewCompilation/testassets/StrongNamedApp/Program.cs similarity index 100% rename from src/MvcPrecompilation/testapps/StrongNamedApp/Program.cs rename to src/Mvc/ViewCompilation/testassets/StrongNamedApp/Program.cs diff --git a/src/MvcPrecompilation/testapps/StrongNamedApp/Startup.cs b/src/Mvc/ViewCompilation/testassets/StrongNamedApp/Startup.cs similarity index 100% rename from src/MvcPrecompilation/testapps/StrongNamedApp/Startup.cs rename to src/Mvc/ViewCompilation/testassets/StrongNamedApp/Startup.cs diff --git a/src/Mvc/ViewCompilation/testassets/StrongNamedApp/StrongNamedApp.csproj b/src/Mvc/ViewCompilation/testassets/StrongNamedApp/StrongNamedApp.csproj new file mode 100644 index 0000000000..083764e87f --- /dev/null +++ b/src/Mvc/ViewCompilation/testassets/StrongNamedApp/StrongNamedApp.csproj @@ -0,0 +1,18 @@ + + + + netcoreapp2.1;net461 + true + true + + true + + + + + + + + + + diff --git a/src/MvcPrecompilation/testapps/StrongNamedApp/Views/Home/Index.cshtml b/src/Mvc/ViewCompilation/testassets/StrongNamedApp/Views/Home/Index.cshtml similarity index 100% rename from src/MvcPrecompilation/testapps/StrongNamedApp/Views/Home/Index.cshtml rename to src/Mvc/ViewCompilation/testassets/StrongNamedApp/Views/Home/Index.cshtml diff --git a/src/MvcPrecompilation/.gitignore b/src/MvcPrecompilation/.gitignore deleted file mode 100644 index 15a9207874..0000000000 --- a/src/MvcPrecompilation/.gitignore +++ /dev/null @@ -1,43 +0,0 @@ -[Oo]bj/ -[Bb]in/ -TestResults/ -.nuget/ -.build/ -.testPublish/ -*.sln.ide/ -_ReSharper.*/ -packages/ -artifacts/ -PublishProfiles/ -.vs/ -.vscode/ -bower_components/ -node_modules/ -debugSettings.json -project.lock.json -*.user -*.suo -*.cache -*.docstates -_ReSharper.* -nuget.exe -*net45.csproj -*net451.csproj -*k10.csproj -*.psess -*.vsp -*.pidb -*.userprefs -*DS_Store -*.ncrunchsolution -*.*sdf -*.ipch -.settings -*.sln.ide -node_modules -*launchSettings.json -*.orig -BuildInfo.generated.cs -msbuild.log -msbuild.binlog -global.json diff --git a/src/MvcPrecompilation/Directory.Build.props b/src/MvcPrecompilation/Directory.Build.props deleted file mode 100644 index 64f6af34d3..0000000000 --- a/src/MvcPrecompilation/Directory.Build.props +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - Microsoft ASP.NET Core - https://github.com/aspnet/MvcPrecompilation - git - $(MSBuildThisFileDirectory) - $(MSBuildThisFileDirectory)build\Key.snk - true - true - true - - diff --git a/src/MvcPrecompilation/Directory.Build.targets b/src/MvcPrecompilation/Directory.Build.targets deleted file mode 100644 index 53b3f6e1da..0000000000 --- a/src/MvcPrecompilation/Directory.Build.targets +++ /dev/null @@ -1,7 +0,0 @@ - - - $(MicrosoftNETCoreApp20PackageVersion) - $(MicrosoftNETCoreApp21PackageVersion) - $(NETStandardLibrary20PackageVersion) - - diff --git a/src/MvcPrecompilation/NuGetPackageVerifier.json b/src/MvcPrecompilation/NuGetPackageVerifier.json deleted file mode 100644 index d69d587620..0000000000 --- a/src/MvcPrecompilation/NuGetPackageVerifier.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "adx": { - "rules": [ - "DefaultCompositeRule" - ], - "packages": { - "Microsoft.AspNetCore.Mvc.Razor.ViewCompilation": { - "exclusions": { - "BUILD_ITEMS_FRAMEWORK": { - "*": "Purposefully creating a netstandard2.0 build item so our targets can be injected for desktop and non-desktop based projects." - } - } - } - } - }, - "Default": { - "rules": [ - "DefaultCompositeRule" - ] - } -} \ No newline at end of file diff --git a/src/MvcPrecompilation/RazorViewCompilation.sln b/src/MvcPrecompilation/RazorViewCompilation.sln deleted file mode 100644 index 3e35780944..0000000000 --- a/src/MvcPrecompilation/RazorViewCompilation.sln +++ /dev/null @@ -1,327 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27130.2036 -MinimumVisualStudioVersion = 15.0.26730.03 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Razor.ViewCompilation", "src\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.csproj", "{4339FC9B-AEC6-442A-B413-A41555ED76C7}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionFiles", "SolutionFiles", "{01707B64-7DC7-4B5A-B0BB-7CD2773AA297}" - ProjectSection(SolutionItems) = preProject - Directory.Build.props = Directory.Build.props - Directory.Build.targets = Directory.Build.targets - NuGet.config = NuGet.config - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{02F7AA35-91AF-491E-9F0E-03CFAF86C720}" - ProjectSection(SolutionItems) = preProject - src\Directory.Build.props = src\Directory.Build.props - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{0398AFFF-505E-4283-89DA-BBD9D28B53DB}" - ProjectSection(SolutionItems) = preProject - test\Directory.Build.props = test\Directory.Build.props - EndProjectSection -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FunctionalTests", "test\FunctionalTests\FunctionalTests.csproj", "{46C9A4B2-8B1C-451B-B670-C194901D66AC}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test", "test\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test.csproj", "{E0D75B4E-839F-4F80-9B1F-B33F616BCC5F}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{87FEE984-F627-4F1E-8995-E5F969B85A19}" - ProjectSection(SolutionItems) = preProject - build\dependencies.props = build\dependencies.props - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "testapps", "testapps", "{0DC7C88C-E3DB-46DF-B47E-AC5ECB2A16B7}" - ProjectSection(SolutionItems) = preProject - testapps\Directory.Build.props = testapps\Directory.Build.props - testapps\Directory.Build.targets = testapps\Directory.Build.targets - EndProjectSection -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleApp", "testapps\SimpleApp\SimpleApp.csproj", "{8B7C86DF-FA69-4F3F-A22B-6BFCCBBCEDE0}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SimpleAppWithAssemblyRename", "testapps\SimpleAppWithAssemblyRename\SimpleAppWithAssemblyRename.csproj", "{D5677246-BC78-426D-9233-0313A04C6D92}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PublishWithEmbedViewSources", "testapps\PublishWithEmbedViewSources\PublishWithEmbedViewSources.csproj", "{7EFC460A-8BAA-4538-8EBE-0B3BB6101E94}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StrongNamedApp", "testapps\StrongNamedApp\StrongNamedApp.csproj", "{87C6A03D-1655-4D1C-82E5-8F553BF4096D}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationWithParseErrors", "testapps\ApplicationWithParseErrors\ApplicationWithParseErrors.csproj", "{AF647059-B86B-46DD-9559-E1324A39B148}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationUsingRelativePaths", "testapps\ApplicationUsingRelativePaths\ApplicationUsingRelativePaths.csproj", "{0B512D79-AA53-4C97-91B3-B0F8B2CA16B8}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationWithConfigureMvc", "testapps\ApplicationWithConfigureMvc\ApplicationWithConfigureMvc.csproj", "{559FBB83-40BC-47AF-A224-312CF8E3629B}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationWithCustomInputFiles", "testapps\ApplicationWithCustomInputFiles\ApplicationWithCustomInputFiles.csproj", "{8F73A290-BCE1-461A-9970-397FFBFCC902}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ClassLibraryTagHelper", "testapps\ClassLibraryTagHelper\ClassLibraryTagHelper.csproj", "{196EF313-71CB-47A9-A77D-AACAF62881A1}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationWithTagHelpers", "testapps\ApplicationWithTagHelpers\ApplicationWithTagHelpers.csproj", "{08552602-37E7-48A7-95A2-BB1A1F57C804}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RazorPagesApp", "testapps\RazorPagesApp\RazorPagesApp.csproj", "{779BACC4-B20E-4F73-A9C7-350443CF1941}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{75244EBD-DFBD-4C4B-9543-C135AC142C7F}" - ProjectSection(SolutionItems) = preProject - tools\Directory.Build.props = tools\Directory.Build.props - EndProjectSection -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tasks", "src\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tasks\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tasks.csproj", "{996D4DEB-1701-435E-8048-1E65790C2050}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationWithRazorSdkNeitherUsed", "testapps\ApplicationWithRazorSdkNeitherUsed\ApplicationWithRazorSdkNeitherUsed.csproj", "{B64D2B9C-5737-4A39-AA46-27757F345B1E}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationWithRazorSdkPrecompilationUsed", "testapps\ApplicationWithRazorSdkPrecompilationUsed\ApplicationWithRazorSdkPrecompilationUsed.csproj", "{3147D272-E8E8-404D-A62C-35CD2C71FC05}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationWithRazorSdkUsed", "testapps\ApplicationWithRazorSdkUsed\ApplicationWithRazorSdkUsed.csproj", "{FAA20AFB-1B2E-4A0B-A421-B83741C81644}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {4339FC9B-AEC6-442A-B413-A41555ED76C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4339FC9B-AEC6-442A-B413-A41555ED76C7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4339FC9B-AEC6-442A-B413-A41555ED76C7}.Debug|x64.ActiveCfg = Debug|Any CPU - {4339FC9B-AEC6-442A-B413-A41555ED76C7}.Debug|x64.Build.0 = Debug|Any CPU - {4339FC9B-AEC6-442A-B413-A41555ED76C7}.Debug|x86.ActiveCfg = Debug|Any CPU - {4339FC9B-AEC6-442A-B413-A41555ED76C7}.Debug|x86.Build.0 = Debug|Any CPU - {4339FC9B-AEC6-442A-B413-A41555ED76C7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4339FC9B-AEC6-442A-B413-A41555ED76C7}.Release|Any CPU.Build.0 = Release|Any CPU - {4339FC9B-AEC6-442A-B413-A41555ED76C7}.Release|x64.ActiveCfg = Release|Any CPU - {4339FC9B-AEC6-442A-B413-A41555ED76C7}.Release|x64.Build.0 = Release|Any CPU - {4339FC9B-AEC6-442A-B413-A41555ED76C7}.Release|x86.ActiveCfg = Release|Any CPU - {4339FC9B-AEC6-442A-B413-A41555ED76C7}.Release|x86.Build.0 = Release|Any CPU - {46C9A4B2-8B1C-451B-B670-C194901D66AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {46C9A4B2-8B1C-451B-B670-C194901D66AC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {46C9A4B2-8B1C-451B-B670-C194901D66AC}.Debug|x64.ActiveCfg = Debug|Any CPU - {46C9A4B2-8B1C-451B-B670-C194901D66AC}.Debug|x64.Build.0 = Debug|Any CPU - {46C9A4B2-8B1C-451B-B670-C194901D66AC}.Debug|x86.ActiveCfg = Debug|Any CPU - {46C9A4B2-8B1C-451B-B670-C194901D66AC}.Debug|x86.Build.0 = Debug|Any CPU - {46C9A4B2-8B1C-451B-B670-C194901D66AC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {46C9A4B2-8B1C-451B-B670-C194901D66AC}.Release|Any CPU.Build.0 = Release|Any CPU - {46C9A4B2-8B1C-451B-B670-C194901D66AC}.Release|x64.ActiveCfg = Release|Any CPU - {46C9A4B2-8B1C-451B-B670-C194901D66AC}.Release|x64.Build.0 = Release|Any CPU - {46C9A4B2-8B1C-451B-B670-C194901D66AC}.Release|x86.ActiveCfg = Release|Any CPU - {46C9A4B2-8B1C-451B-B670-C194901D66AC}.Release|x86.Build.0 = Release|Any CPU - {E0D75B4E-839F-4F80-9B1F-B33F616BCC5F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E0D75B4E-839F-4F80-9B1F-B33F616BCC5F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E0D75B4E-839F-4F80-9B1F-B33F616BCC5F}.Debug|x64.ActiveCfg = Debug|Any CPU - {E0D75B4E-839F-4F80-9B1F-B33F616BCC5F}.Debug|x64.Build.0 = Debug|Any CPU - {E0D75B4E-839F-4F80-9B1F-B33F616BCC5F}.Debug|x86.ActiveCfg = Debug|Any CPU - {E0D75B4E-839F-4F80-9B1F-B33F616BCC5F}.Debug|x86.Build.0 = Debug|Any CPU - {E0D75B4E-839F-4F80-9B1F-B33F616BCC5F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E0D75B4E-839F-4F80-9B1F-B33F616BCC5F}.Release|Any CPU.Build.0 = Release|Any CPU - {E0D75B4E-839F-4F80-9B1F-B33F616BCC5F}.Release|x64.ActiveCfg = Release|Any CPU - {E0D75B4E-839F-4F80-9B1F-B33F616BCC5F}.Release|x64.Build.0 = Release|Any CPU - {E0D75B4E-839F-4F80-9B1F-B33F616BCC5F}.Release|x86.ActiveCfg = Release|Any CPU - {E0D75B4E-839F-4F80-9B1F-B33F616BCC5F}.Release|x86.Build.0 = Release|Any CPU - {8B7C86DF-FA69-4F3F-A22B-6BFCCBBCEDE0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8B7C86DF-FA69-4F3F-A22B-6BFCCBBCEDE0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8B7C86DF-FA69-4F3F-A22B-6BFCCBBCEDE0}.Debug|x64.ActiveCfg = Debug|Any CPU - {8B7C86DF-FA69-4F3F-A22B-6BFCCBBCEDE0}.Debug|x64.Build.0 = Debug|Any CPU - {8B7C86DF-FA69-4F3F-A22B-6BFCCBBCEDE0}.Debug|x86.ActiveCfg = Debug|Any CPU - {8B7C86DF-FA69-4F3F-A22B-6BFCCBBCEDE0}.Debug|x86.Build.0 = Debug|Any CPU - {8B7C86DF-FA69-4F3F-A22B-6BFCCBBCEDE0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8B7C86DF-FA69-4F3F-A22B-6BFCCBBCEDE0}.Release|Any CPU.Build.0 = Release|Any CPU - {8B7C86DF-FA69-4F3F-A22B-6BFCCBBCEDE0}.Release|x64.ActiveCfg = Release|Any CPU - {8B7C86DF-FA69-4F3F-A22B-6BFCCBBCEDE0}.Release|x64.Build.0 = Release|Any CPU - {8B7C86DF-FA69-4F3F-A22B-6BFCCBBCEDE0}.Release|x86.ActiveCfg = Release|Any CPU - {8B7C86DF-FA69-4F3F-A22B-6BFCCBBCEDE0}.Release|x86.Build.0 = Release|Any CPU - {D5677246-BC78-426D-9233-0313A04C6D92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D5677246-BC78-426D-9233-0313A04C6D92}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D5677246-BC78-426D-9233-0313A04C6D92}.Debug|x64.ActiveCfg = Debug|Any CPU - {D5677246-BC78-426D-9233-0313A04C6D92}.Debug|x64.Build.0 = Debug|Any CPU - {D5677246-BC78-426D-9233-0313A04C6D92}.Debug|x86.ActiveCfg = Debug|Any CPU - {D5677246-BC78-426D-9233-0313A04C6D92}.Debug|x86.Build.0 = Debug|Any CPU - {D5677246-BC78-426D-9233-0313A04C6D92}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D5677246-BC78-426D-9233-0313A04C6D92}.Release|Any CPU.Build.0 = Release|Any CPU - {D5677246-BC78-426D-9233-0313A04C6D92}.Release|x64.ActiveCfg = Release|Any CPU - {D5677246-BC78-426D-9233-0313A04C6D92}.Release|x64.Build.0 = Release|Any CPU - {D5677246-BC78-426D-9233-0313A04C6D92}.Release|x86.ActiveCfg = Release|Any CPU - {D5677246-BC78-426D-9233-0313A04C6D92}.Release|x86.Build.0 = Release|Any CPU - {7EFC460A-8BAA-4538-8EBE-0B3BB6101E94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7EFC460A-8BAA-4538-8EBE-0B3BB6101E94}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7EFC460A-8BAA-4538-8EBE-0B3BB6101E94}.Debug|x64.ActiveCfg = Debug|Any CPU - {7EFC460A-8BAA-4538-8EBE-0B3BB6101E94}.Debug|x64.Build.0 = Debug|Any CPU - {7EFC460A-8BAA-4538-8EBE-0B3BB6101E94}.Debug|x86.ActiveCfg = Debug|Any CPU - {7EFC460A-8BAA-4538-8EBE-0B3BB6101E94}.Debug|x86.Build.0 = Debug|Any CPU - {7EFC460A-8BAA-4538-8EBE-0B3BB6101E94}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7EFC460A-8BAA-4538-8EBE-0B3BB6101E94}.Release|Any CPU.Build.0 = Release|Any CPU - {7EFC460A-8BAA-4538-8EBE-0B3BB6101E94}.Release|x64.ActiveCfg = Release|Any CPU - {7EFC460A-8BAA-4538-8EBE-0B3BB6101E94}.Release|x64.Build.0 = Release|Any CPU - {7EFC460A-8BAA-4538-8EBE-0B3BB6101E94}.Release|x86.ActiveCfg = Release|Any CPU - {7EFC460A-8BAA-4538-8EBE-0B3BB6101E94}.Release|x86.Build.0 = Release|Any CPU - {87C6A03D-1655-4D1C-82E5-8F553BF4096D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {87C6A03D-1655-4D1C-82E5-8F553BF4096D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {87C6A03D-1655-4D1C-82E5-8F553BF4096D}.Debug|x64.ActiveCfg = Debug|Any CPU - {87C6A03D-1655-4D1C-82E5-8F553BF4096D}.Debug|x64.Build.0 = Debug|Any CPU - {87C6A03D-1655-4D1C-82E5-8F553BF4096D}.Debug|x86.ActiveCfg = Debug|Any CPU - {87C6A03D-1655-4D1C-82E5-8F553BF4096D}.Debug|x86.Build.0 = Debug|Any CPU - {87C6A03D-1655-4D1C-82E5-8F553BF4096D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {87C6A03D-1655-4D1C-82E5-8F553BF4096D}.Release|Any CPU.Build.0 = Release|Any CPU - {87C6A03D-1655-4D1C-82E5-8F553BF4096D}.Release|x64.ActiveCfg = Release|Any CPU - {87C6A03D-1655-4D1C-82E5-8F553BF4096D}.Release|x64.Build.0 = Release|Any CPU - {87C6A03D-1655-4D1C-82E5-8F553BF4096D}.Release|x86.ActiveCfg = Release|Any CPU - {87C6A03D-1655-4D1C-82E5-8F553BF4096D}.Release|x86.Build.0 = Release|Any CPU - {AF647059-B86B-46DD-9559-E1324A39B148}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AF647059-B86B-46DD-9559-E1324A39B148}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AF647059-B86B-46DD-9559-E1324A39B148}.Debug|x64.ActiveCfg = Debug|Any CPU - {AF647059-B86B-46DD-9559-E1324A39B148}.Debug|x64.Build.0 = Debug|Any CPU - {AF647059-B86B-46DD-9559-E1324A39B148}.Debug|x86.ActiveCfg = Debug|Any CPU - {AF647059-B86B-46DD-9559-E1324A39B148}.Debug|x86.Build.0 = Debug|Any CPU - {AF647059-B86B-46DD-9559-E1324A39B148}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AF647059-B86B-46DD-9559-E1324A39B148}.Release|Any CPU.Build.0 = Release|Any CPU - {AF647059-B86B-46DD-9559-E1324A39B148}.Release|x64.ActiveCfg = Release|Any CPU - {AF647059-B86B-46DD-9559-E1324A39B148}.Release|x64.Build.0 = Release|Any CPU - {AF647059-B86B-46DD-9559-E1324A39B148}.Release|x86.ActiveCfg = Release|Any CPU - {AF647059-B86B-46DD-9559-E1324A39B148}.Release|x86.Build.0 = Release|Any CPU - {0B512D79-AA53-4C97-91B3-B0F8B2CA16B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0B512D79-AA53-4C97-91B3-B0F8B2CA16B8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0B512D79-AA53-4C97-91B3-B0F8B2CA16B8}.Debug|x64.ActiveCfg = Debug|Any CPU - {0B512D79-AA53-4C97-91B3-B0F8B2CA16B8}.Debug|x64.Build.0 = Debug|Any CPU - {0B512D79-AA53-4C97-91B3-B0F8B2CA16B8}.Debug|x86.ActiveCfg = Debug|Any CPU - {0B512D79-AA53-4C97-91B3-B0F8B2CA16B8}.Debug|x86.Build.0 = Debug|Any CPU - {0B512D79-AA53-4C97-91B3-B0F8B2CA16B8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0B512D79-AA53-4C97-91B3-B0F8B2CA16B8}.Release|Any CPU.Build.0 = Release|Any CPU - {0B512D79-AA53-4C97-91B3-B0F8B2CA16B8}.Release|x64.ActiveCfg = Release|Any CPU - {0B512D79-AA53-4C97-91B3-B0F8B2CA16B8}.Release|x64.Build.0 = Release|Any CPU - {0B512D79-AA53-4C97-91B3-B0F8B2CA16B8}.Release|x86.ActiveCfg = Release|Any CPU - {0B512D79-AA53-4C97-91B3-B0F8B2CA16B8}.Release|x86.Build.0 = Release|Any CPU - {559FBB83-40BC-47AF-A224-312CF8E3629B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {559FBB83-40BC-47AF-A224-312CF8E3629B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {559FBB83-40BC-47AF-A224-312CF8E3629B}.Debug|x64.ActiveCfg = Debug|Any CPU - {559FBB83-40BC-47AF-A224-312CF8E3629B}.Debug|x64.Build.0 = Debug|Any CPU - {559FBB83-40BC-47AF-A224-312CF8E3629B}.Debug|x86.ActiveCfg = Debug|Any CPU - {559FBB83-40BC-47AF-A224-312CF8E3629B}.Debug|x86.Build.0 = Debug|Any CPU - {559FBB83-40BC-47AF-A224-312CF8E3629B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {559FBB83-40BC-47AF-A224-312CF8E3629B}.Release|Any CPU.Build.0 = Release|Any CPU - {559FBB83-40BC-47AF-A224-312CF8E3629B}.Release|x64.ActiveCfg = Release|Any CPU - {559FBB83-40BC-47AF-A224-312CF8E3629B}.Release|x64.Build.0 = Release|Any CPU - {559FBB83-40BC-47AF-A224-312CF8E3629B}.Release|x86.ActiveCfg = Release|Any CPU - {559FBB83-40BC-47AF-A224-312CF8E3629B}.Release|x86.Build.0 = Release|Any CPU - {8F73A290-BCE1-461A-9970-397FFBFCC902}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8F73A290-BCE1-461A-9970-397FFBFCC902}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8F73A290-BCE1-461A-9970-397FFBFCC902}.Debug|x64.ActiveCfg = Debug|Any CPU - {8F73A290-BCE1-461A-9970-397FFBFCC902}.Debug|x64.Build.0 = Debug|Any CPU - {8F73A290-BCE1-461A-9970-397FFBFCC902}.Debug|x86.ActiveCfg = Debug|Any CPU - {8F73A290-BCE1-461A-9970-397FFBFCC902}.Debug|x86.Build.0 = Debug|Any CPU - {8F73A290-BCE1-461A-9970-397FFBFCC902}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8F73A290-BCE1-461A-9970-397FFBFCC902}.Release|Any CPU.Build.0 = Release|Any CPU - {8F73A290-BCE1-461A-9970-397FFBFCC902}.Release|x64.ActiveCfg = Release|Any CPU - {8F73A290-BCE1-461A-9970-397FFBFCC902}.Release|x64.Build.0 = Release|Any CPU - {8F73A290-BCE1-461A-9970-397FFBFCC902}.Release|x86.ActiveCfg = Release|Any CPU - {8F73A290-BCE1-461A-9970-397FFBFCC902}.Release|x86.Build.0 = Release|Any CPU - {196EF313-71CB-47A9-A77D-AACAF62881A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {196EF313-71CB-47A9-A77D-AACAF62881A1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {196EF313-71CB-47A9-A77D-AACAF62881A1}.Debug|x64.ActiveCfg = Debug|Any CPU - {196EF313-71CB-47A9-A77D-AACAF62881A1}.Debug|x64.Build.0 = Debug|Any CPU - {196EF313-71CB-47A9-A77D-AACAF62881A1}.Debug|x86.ActiveCfg = Debug|Any CPU - {196EF313-71CB-47A9-A77D-AACAF62881A1}.Debug|x86.Build.0 = Debug|Any CPU - {196EF313-71CB-47A9-A77D-AACAF62881A1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {196EF313-71CB-47A9-A77D-AACAF62881A1}.Release|Any CPU.Build.0 = Release|Any CPU - {196EF313-71CB-47A9-A77D-AACAF62881A1}.Release|x64.ActiveCfg = Release|Any CPU - {196EF313-71CB-47A9-A77D-AACAF62881A1}.Release|x64.Build.0 = Release|Any CPU - {196EF313-71CB-47A9-A77D-AACAF62881A1}.Release|x86.ActiveCfg = Release|Any CPU - {196EF313-71CB-47A9-A77D-AACAF62881A1}.Release|x86.Build.0 = Release|Any CPU - {08552602-37E7-48A7-95A2-BB1A1F57C804}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {08552602-37E7-48A7-95A2-BB1A1F57C804}.Debug|Any CPU.Build.0 = Debug|Any CPU - {08552602-37E7-48A7-95A2-BB1A1F57C804}.Debug|x64.ActiveCfg = Debug|Any CPU - {08552602-37E7-48A7-95A2-BB1A1F57C804}.Debug|x64.Build.0 = Debug|Any CPU - {08552602-37E7-48A7-95A2-BB1A1F57C804}.Debug|x86.ActiveCfg = Debug|Any CPU - {08552602-37E7-48A7-95A2-BB1A1F57C804}.Debug|x86.Build.0 = Debug|Any CPU - {08552602-37E7-48A7-95A2-BB1A1F57C804}.Release|Any CPU.ActiveCfg = Release|Any CPU - {08552602-37E7-48A7-95A2-BB1A1F57C804}.Release|Any CPU.Build.0 = Release|Any CPU - {08552602-37E7-48A7-95A2-BB1A1F57C804}.Release|x64.ActiveCfg = Release|Any CPU - {08552602-37E7-48A7-95A2-BB1A1F57C804}.Release|x64.Build.0 = Release|Any CPU - {08552602-37E7-48A7-95A2-BB1A1F57C804}.Release|x86.ActiveCfg = Release|Any CPU - {08552602-37E7-48A7-95A2-BB1A1F57C804}.Release|x86.Build.0 = Release|Any CPU - {779BACC4-B20E-4F73-A9C7-350443CF1941}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {779BACC4-B20E-4F73-A9C7-350443CF1941}.Debug|Any CPU.Build.0 = Debug|Any CPU - {779BACC4-B20E-4F73-A9C7-350443CF1941}.Debug|x64.ActiveCfg = Debug|Any CPU - {779BACC4-B20E-4F73-A9C7-350443CF1941}.Debug|x64.Build.0 = Debug|Any CPU - {779BACC4-B20E-4F73-A9C7-350443CF1941}.Debug|x86.ActiveCfg = Debug|Any CPU - {779BACC4-B20E-4F73-A9C7-350443CF1941}.Debug|x86.Build.0 = Debug|Any CPU - {779BACC4-B20E-4F73-A9C7-350443CF1941}.Release|Any CPU.ActiveCfg = Release|Any CPU - {779BACC4-B20E-4F73-A9C7-350443CF1941}.Release|Any CPU.Build.0 = Release|Any CPU - {779BACC4-B20E-4F73-A9C7-350443CF1941}.Release|x64.ActiveCfg = Release|Any CPU - {779BACC4-B20E-4F73-A9C7-350443CF1941}.Release|x64.Build.0 = Release|Any CPU - {779BACC4-B20E-4F73-A9C7-350443CF1941}.Release|x86.ActiveCfg = Release|Any CPU - {779BACC4-B20E-4F73-A9C7-350443CF1941}.Release|x86.Build.0 = Release|Any CPU - {996D4DEB-1701-435E-8048-1E65790C2050}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {996D4DEB-1701-435E-8048-1E65790C2050}.Debug|Any CPU.Build.0 = Debug|Any CPU - {996D4DEB-1701-435E-8048-1E65790C2050}.Debug|x64.ActiveCfg = Debug|Any CPU - {996D4DEB-1701-435E-8048-1E65790C2050}.Debug|x64.Build.0 = Debug|Any CPU - {996D4DEB-1701-435E-8048-1E65790C2050}.Debug|x86.ActiveCfg = Debug|Any CPU - {996D4DEB-1701-435E-8048-1E65790C2050}.Debug|x86.Build.0 = Debug|Any CPU - {996D4DEB-1701-435E-8048-1E65790C2050}.Release|Any CPU.ActiveCfg = Release|Any CPU - {996D4DEB-1701-435E-8048-1E65790C2050}.Release|Any CPU.Build.0 = Release|Any CPU - {996D4DEB-1701-435E-8048-1E65790C2050}.Release|x64.ActiveCfg = Release|Any CPU - {996D4DEB-1701-435E-8048-1E65790C2050}.Release|x64.Build.0 = Release|Any CPU - {996D4DEB-1701-435E-8048-1E65790C2050}.Release|x86.ActiveCfg = Release|Any CPU - {996D4DEB-1701-435E-8048-1E65790C2050}.Release|x86.Build.0 = Release|Any CPU - {B64D2B9C-5737-4A39-AA46-27757F345B1E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B64D2B9C-5737-4A39-AA46-27757F345B1E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B64D2B9C-5737-4A39-AA46-27757F345B1E}.Debug|x64.ActiveCfg = Debug|Any CPU - {B64D2B9C-5737-4A39-AA46-27757F345B1E}.Debug|x64.Build.0 = Debug|Any CPU - {B64D2B9C-5737-4A39-AA46-27757F345B1E}.Debug|x86.ActiveCfg = Debug|Any CPU - {B64D2B9C-5737-4A39-AA46-27757F345B1E}.Debug|x86.Build.0 = Debug|Any CPU - {B64D2B9C-5737-4A39-AA46-27757F345B1E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B64D2B9C-5737-4A39-AA46-27757F345B1E}.Release|Any CPU.Build.0 = Release|Any CPU - {B64D2B9C-5737-4A39-AA46-27757F345B1E}.Release|x64.ActiveCfg = Release|Any CPU - {B64D2B9C-5737-4A39-AA46-27757F345B1E}.Release|x64.Build.0 = Release|Any CPU - {B64D2B9C-5737-4A39-AA46-27757F345B1E}.Release|x86.ActiveCfg = Release|Any CPU - {B64D2B9C-5737-4A39-AA46-27757F345B1E}.Release|x86.Build.0 = Release|Any CPU - {3147D272-E8E8-404D-A62C-35CD2C71FC05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3147D272-E8E8-404D-A62C-35CD2C71FC05}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3147D272-E8E8-404D-A62C-35CD2C71FC05}.Debug|x64.ActiveCfg = Debug|Any CPU - {3147D272-E8E8-404D-A62C-35CD2C71FC05}.Debug|x64.Build.0 = Debug|Any CPU - {3147D272-E8E8-404D-A62C-35CD2C71FC05}.Debug|x86.ActiveCfg = Debug|Any CPU - {3147D272-E8E8-404D-A62C-35CD2C71FC05}.Debug|x86.Build.0 = Debug|Any CPU - {3147D272-E8E8-404D-A62C-35CD2C71FC05}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3147D272-E8E8-404D-A62C-35CD2C71FC05}.Release|Any CPU.Build.0 = Release|Any CPU - {3147D272-E8E8-404D-A62C-35CD2C71FC05}.Release|x64.ActiveCfg = Release|Any CPU - {3147D272-E8E8-404D-A62C-35CD2C71FC05}.Release|x64.Build.0 = Release|Any CPU - {3147D272-E8E8-404D-A62C-35CD2C71FC05}.Release|x86.ActiveCfg = Release|Any CPU - {3147D272-E8E8-404D-A62C-35CD2C71FC05}.Release|x86.Build.0 = Release|Any CPU - {FAA20AFB-1B2E-4A0B-A421-B83741C81644}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FAA20AFB-1B2E-4A0B-A421-B83741C81644}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FAA20AFB-1B2E-4A0B-A421-B83741C81644}.Debug|x64.ActiveCfg = Debug|Any CPU - {FAA20AFB-1B2E-4A0B-A421-B83741C81644}.Debug|x64.Build.0 = Debug|Any CPU - {FAA20AFB-1B2E-4A0B-A421-B83741C81644}.Debug|x86.ActiveCfg = Debug|Any CPU - {FAA20AFB-1B2E-4A0B-A421-B83741C81644}.Debug|x86.Build.0 = Debug|Any CPU - {FAA20AFB-1B2E-4A0B-A421-B83741C81644}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FAA20AFB-1B2E-4A0B-A421-B83741C81644}.Release|Any CPU.Build.0 = Release|Any CPU - {FAA20AFB-1B2E-4A0B-A421-B83741C81644}.Release|x64.ActiveCfg = Release|Any CPU - {FAA20AFB-1B2E-4A0B-A421-B83741C81644}.Release|x64.Build.0 = Release|Any CPU - {FAA20AFB-1B2E-4A0B-A421-B83741C81644}.Release|x86.ActiveCfg = Release|Any CPU - {FAA20AFB-1B2E-4A0B-A421-B83741C81644}.Release|x86.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {4339FC9B-AEC6-442A-B413-A41555ED76C7} = {02F7AA35-91AF-491E-9F0E-03CFAF86C720} - {46C9A4B2-8B1C-451B-B670-C194901D66AC} = {0398AFFF-505E-4283-89DA-BBD9D28B53DB} - {E0D75B4E-839F-4F80-9B1F-B33F616BCC5F} = {0398AFFF-505E-4283-89DA-BBD9D28B53DB} - {8B7C86DF-FA69-4F3F-A22B-6BFCCBBCEDE0} = {0DC7C88C-E3DB-46DF-B47E-AC5ECB2A16B7} - {D5677246-BC78-426D-9233-0313A04C6D92} = {0DC7C88C-E3DB-46DF-B47E-AC5ECB2A16B7} - {7EFC460A-8BAA-4538-8EBE-0B3BB6101E94} = {0DC7C88C-E3DB-46DF-B47E-AC5ECB2A16B7} - {87C6A03D-1655-4D1C-82E5-8F553BF4096D} = {0DC7C88C-E3DB-46DF-B47E-AC5ECB2A16B7} - {AF647059-B86B-46DD-9559-E1324A39B148} = {0DC7C88C-E3DB-46DF-B47E-AC5ECB2A16B7} - {0B512D79-AA53-4C97-91B3-B0F8B2CA16B8} = {0DC7C88C-E3DB-46DF-B47E-AC5ECB2A16B7} - {559FBB83-40BC-47AF-A224-312CF8E3629B} = {0DC7C88C-E3DB-46DF-B47E-AC5ECB2A16B7} - {8F73A290-BCE1-461A-9970-397FFBFCC902} = {0DC7C88C-E3DB-46DF-B47E-AC5ECB2A16B7} - {196EF313-71CB-47A9-A77D-AACAF62881A1} = {0DC7C88C-E3DB-46DF-B47E-AC5ECB2A16B7} - {08552602-37E7-48A7-95A2-BB1A1F57C804} = {0DC7C88C-E3DB-46DF-B47E-AC5ECB2A16B7} - {779BACC4-B20E-4F73-A9C7-350443CF1941} = {0DC7C88C-E3DB-46DF-B47E-AC5ECB2A16B7} - {996D4DEB-1701-435E-8048-1E65790C2050} = {02F7AA35-91AF-491E-9F0E-03CFAF86C720} - {B64D2B9C-5737-4A39-AA46-27757F345B1E} = {0DC7C88C-E3DB-46DF-B47E-AC5ECB2A16B7} - {3147D272-E8E8-404D-A62C-35CD2C71FC05} = {0DC7C88C-E3DB-46DF-B47E-AC5ECB2A16B7} - {FAA20AFB-1B2E-4A0B-A421-B83741C81644} = {0DC7C88C-E3DB-46DF-B47E-AC5ECB2A16B7} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {177268A1-F5B2-451E-8ABE-BEF0C572481A} - EndGlobalSection -EndGlobal diff --git a/src/MvcPrecompilation/build/Key.snk b/src/MvcPrecompilation/build/Key.snk deleted file mode 100644 index e10e4889c125d3120cd9e81582243d70f7cbb806..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 596 zcmV-a0;~N80ssI2Bme+XQ$aES1ONa50098=Iw=HCsnz~#iVhm& zj%TU(_THUee?3yHBjk$37ysB?i5#7WD$={H zV4B!OxRPrb|8)HPg~A}8P>^=#y<)56#=E&NzcjOtPK~<4n6GHt=K$ro*T(lhby_@U zEk(hLzk1H)0yXj{A_5>fk-TgNoP|q6(tP2xo8zt8i%212CWM#AeCd?`hS|4~L({h~Moo(~vy&3Z z1uI}`fd^*>o=rwbAGymj6RM^pZm(*Kfhs+Y1#`-2JPWZMK8@;ZWCk2+9bX4YP);~fj-BU*R zQPvWv$89!{Rl9wM+zR>_TSkn^voYxA?2G iKnV#iZ6Ah`K>b=@=IjYJXrxL124zR(38)nxe+&q_$QXwJ diff --git a/src/MvcPrecompilation/build/dependencies.props b/src/MvcPrecompilation/build/dependencies.props deleted file mode 100644 index b37254d78f..0000000000 --- a/src/MvcPrecompilation/build/dependencies.props +++ /dev/null @@ -1,39 +0,0 @@ - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - - - - - 2.1.3-rtm-15802 - 15.6.82 - 2.0.0 - 2.1.2 - 15.6.1 - 2.0.3 - 2.3.1 - 2.4.0-beta.1.build3945 - - - - - - - - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 0.5.1 - 2.1.2 - 2.1.0 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - 2.1.1 - - \ No newline at end of file diff --git a/src/MvcPrecompilation/build/repo.props b/src/MvcPrecompilation/build/repo.props deleted file mode 100644 index 1dc8b8100d..0000000000 --- a/src/MvcPrecompilation/build/repo.props +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/src/MvcPrecompilation/build/sources.props b/src/MvcPrecompilation/build/sources.props deleted file mode 100644 index 9215df9751..0000000000 --- a/src/MvcPrecompilation/build/sources.props +++ /dev/null @@ -1,17 +0,0 @@ - - - - - $(DotNetRestoreSources) - - $(RestoreSources); - https://dotnet.myget.org/F/dotnet-core/api/v3/index.json; - https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json; - https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json; - - - $(RestoreSources); - https://api.nuget.org/v3/index.json; - - - diff --git a/src/MvcPrecompilation/src/Directory.Build.props b/src/MvcPrecompilation/src/Directory.Build.props deleted file mode 100644 index 1e0980f663..0000000000 --- a/src/MvcPrecompilation/src/Directory.Build.props +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tasks/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tasks.csproj b/src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tasks/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tasks.csproj deleted file mode 100644 index 7afcec3de8..0000000000 --- a/src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tasks/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tasks.csproj +++ /dev/null @@ -1,15 +0,0 @@ - - - - Microsoft Build Tasks supporting Razor view compilation. - netstandard2.0 - false - false - - - - - - - - diff --git a/src/MvcPrecompilation/test/Directory.Build.props b/src/MvcPrecompilation/test/Directory.Build.props deleted file mode 100644 index c867cbd112..0000000000 --- a/src/MvcPrecompilation/test/Directory.Build.props +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/src/MvcPrecompilation/test/FunctionalTests/FunctionalTests.csproj b/src/MvcPrecompilation/test/FunctionalTests/FunctionalTests.csproj deleted file mode 100644 index 14357e3edf..0000000000 --- a/src/MvcPrecompilation/test/FunctionalTests/FunctionalTests.csproj +++ /dev/null @@ -1,50 +0,0 @@ - - - - netcoreapp2.1;net461 - - $(DefineConstants);__remove_this_to__GENERATE_BASELINES - $(DefineConstants);GENERATE_BASELINES - false - false - false - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/MvcPrecompilation/testapps/ApplicationUsingRelativePaths/ApplicationUsingRelativePaths.csproj b/src/MvcPrecompilation/testapps/ApplicationUsingRelativePaths/ApplicationUsingRelativePaths.csproj deleted file mode 100644 index 5374844ba1..0000000000 --- a/src/MvcPrecompilation/testapps/ApplicationUsingRelativePaths/ApplicationUsingRelativePaths.csproj +++ /dev/null @@ -1,16 +0,0 @@ - - - - netcoreapp2.1;net461 - - true - - - - - - - - - - diff --git a/src/MvcPrecompilation/testapps/ApplicationWithConfigureMvc/ApplicationWithConfigureMvc.csproj b/src/MvcPrecompilation/testapps/ApplicationWithConfigureMvc/ApplicationWithConfigureMvc.csproj deleted file mode 100644 index 73a82f7d8c..0000000000 --- a/src/MvcPrecompilation/testapps/ApplicationWithConfigureMvc/ApplicationWithConfigureMvc.csproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - netcoreapp2.1;net461 - $(DefineConstants);TEST123 - - true - - - - - - - - - - diff --git a/src/MvcPrecompilation/testapps/ApplicationWithCustomInputFiles/ApplicationWithCustomInputFiles.csproj b/src/MvcPrecompilation/testapps/ApplicationWithCustomInputFiles/ApplicationWithCustomInputFiles.csproj deleted file mode 100644 index ee093ff56b..0000000000 --- a/src/MvcPrecompilation/testapps/ApplicationWithCustomInputFiles/ApplicationWithCustomInputFiles.csproj +++ /dev/null @@ -1,21 +0,0 @@ - - - - netcoreapp2.1;net461 - - true - true - - - - - - - - - - - - - - diff --git a/src/MvcPrecompilation/testapps/ApplicationWithParseErrors/ApplicationWithParseErrors.csproj b/src/MvcPrecompilation/testapps/ApplicationWithParseErrors/ApplicationWithParseErrors.csproj deleted file mode 100644 index 5374844ba1..0000000000 --- a/src/MvcPrecompilation/testapps/ApplicationWithParseErrors/ApplicationWithParseErrors.csproj +++ /dev/null @@ -1,16 +0,0 @@ - - - - netcoreapp2.1;net461 - - true - - - - - - - - - - diff --git a/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkNeitherUsed/ApplicationWithRazorSdkNeitherUsed.csproj b/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkNeitherUsed/ApplicationWithRazorSdkNeitherUsed.csproj deleted file mode 100644 index ed3be5e01e..0000000000 --- a/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkNeitherUsed/ApplicationWithRazorSdkNeitherUsed.csproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - netcoreapp2.1;net461 - - - false - - - - - - - - - - - diff --git a/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkPrecompilationUsed/ApplicationWithRazorSdkPrecompilationUsed.csproj b/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkPrecompilationUsed/ApplicationWithRazorSdkPrecompilationUsed.csproj deleted file mode 100644 index 5472e11970..0000000000 --- a/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkPrecompilationUsed/ApplicationWithRazorSdkPrecompilationUsed.csproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - netcoreapp2.1;net461 - - - true - - - - - - - - - - - diff --git a/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkUsed/ApplicationWithRazorSdkUsed.csproj b/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkUsed/ApplicationWithRazorSdkUsed.csproj deleted file mode 100644 index 5bb5c0b9c2..0000000000 --- a/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkUsed/ApplicationWithRazorSdkUsed.csproj +++ /dev/null @@ -1,15 +0,0 @@ - - - - netcoreapp2.1;net461 - - - - - - - - - - - diff --git a/src/MvcPrecompilation/testapps/ApplicationWithTagHelpers/ApplicationWithTagHelpers.csproj b/src/MvcPrecompilation/testapps/ApplicationWithTagHelpers/ApplicationWithTagHelpers.csproj deleted file mode 100644 index f0a78a8f6b..0000000000 --- a/src/MvcPrecompilation/testapps/ApplicationWithTagHelpers/ApplicationWithTagHelpers.csproj +++ /dev/null @@ -1,20 +0,0 @@ - - - - netcoreapp2.1;net461 - - true - - - - - - - - - - - - - - diff --git a/src/MvcPrecompilation/testapps/PublishWithEmbedViewSources/PublishWithEmbedViewSources.csproj b/src/MvcPrecompilation/testapps/PublishWithEmbedViewSources/PublishWithEmbedViewSources.csproj deleted file mode 100644 index c6ccf113dc..0000000000 --- a/src/MvcPrecompilation/testapps/PublishWithEmbedViewSources/PublishWithEmbedViewSources.csproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - netcoreapp2.1;net461 - - true - true - - - - - - - - - - diff --git a/src/MvcPrecompilation/testapps/RazorPagesApp/RazorPagesApp.csproj b/src/MvcPrecompilation/testapps/RazorPagesApp/RazorPagesApp.csproj deleted file mode 100644 index 3ab146c9bb..0000000000 --- a/src/MvcPrecompilation/testapps/RazorPagesApp/RazorPagesApp.csproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - netcoreapp2.1;net461 - - true - - - - - - - - - - - diff --git a/src/MvcPrecompilation/testapps/SimpleApp/SimpleApp.csproj b/src/MvcPrecompilation/testapps/SimpleApp/SimpleApp.csproj deleted file mode 100644 index 725e3d45d0..0000000000 --- a/src/MvcPrecompilation/testapps/SimpleApp/SimpleApp.csproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - netcoreapp2.1;net461 - win7-x86;debian-x64 - - true - - - - - - - - - - diff --git a/src/MvcPrecompilation/testapps/SimpleAppWithAssemblyRename/SimpleAppWithAssemblyRename.csproj b/src/MvcPrecompilation/testapps/SimpleAppWithAssemblyRename/SimpleAppWithAssemblyRename.csproj deleted file mode 100644 index 8b879ca184..0000000000 --- a/src/MvcPrecompilation/testapps/SimpleAppWithAssemblyRename/SimpleAppWithAssemblyRename.csproj +++ /dev/null @@ -1,17 +0,0 @@ - - - - NewAssemblyName - netcoreapp2.1;net461 - - true - - - - - - - - - - diff --git a/src/MvcPrecompilation/testapps/StrongNamedApp/StrongNamedApp.csproj b/src/MvcPrecompilation/testapps/StrongNamedApp/StrongNamedApp.csproj deleted file mode 100644 index c4df089b97..0000000000 --- a/src/MvcPrecompilation/testapps/StrongNamedApp/StrongNamedApp.csproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - netcoreapp2.1;net461 - true - true - - true - - - - - - - - - - diff --git a/src/MvcPrecompilation/version.props b/src/MvcPrecompilation/version.props deleted file mode 100644 index 669c874829..0000000000 --- a/src/MvcPrecompilation/version.props +++ /dev/null @@ -1,12 +0,0 @@ - - - 2.1.1 - rtm - $(VersionPrefix) - $(VersionPrefix)-$(VersionSuffix)-final - t000 - a- - $(FeatureBranchVersionPrefix)$(VersionSuffix)-$([System.Text.RegularExpressions.Regex]::Replace('$(FeatureBranchVersionSuffix)', '[^\w-]', '-')) - $(VersionSuffix)-$(BuildNumber) - - From 4c8db32b1c1e6c4dc79246526433da97e1f9772a Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 10 Jan 2019 08:21:26 -0800 Subject: [PATCH 02/15] Don't restore npmproj files in parallel (#6560) NPM does not handle this well, so only run one NPM command at a time --- build/dependencies.props | 2 +- build/repo.props | 15 +++++----- eng/scripts/CodeCheck.ps1 | 5 ++-- eng/targets/Npm.Common.targets | 5 ++-- korebuild-lock.txt | 4 +-- src/SignalR/clients/ts/client-ts.npmproj | 7 +++++ .../clients/ts/common/package-lock.json | 28 +++++-------------- 7 files changed, 30 insertions(+), 36 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index dfe42b8b54..be764b8576 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -20,7 +20,7 @@ $(KoreBuildVersion) $(KoreBuildVersion) - 2.1.7-build-20190109.2 + 2.1.7-build-20190110.2 diff --git a/build/repo.props b/build/repo.props index 58098b0ee5..d7bebe44d4 100644 --- a/build/repo.props +++ b/build/repo.props @@ -70,17 +70,16 @@ - + + false + - - - - - + $(RepositoryRoot)**\obj\**\*;"> + false + diff --git a/eng/scripts/CodeCheck.ps1 b/eng/scripts/CodeCheck.ps1 index 9e4077443e..f801899563 100644 --- a/eng/scripts/CodeCheck.ps1 +++ b/eng/scripts/CodeCheck.ps1 @@ -16,8 +16,8 @@ $repoRoot = Resolve-Path "$PSScriptRoot/../../" [string[]] $errors = @() function LogError([string]$message) { - Write-Host -f Red "error: $messsage" - $errors += $message + Write-Host -f Red "error: $message" + $script:errors += $message } try { @@ -81,7 +81,6 @@ finally { Write-Host "" foreach ($err in $errors) { - Write-Host -f Red "error : $err" } diff --git a/eng/targets/Npm.Common.targets b/eng/targets/Npm.Common.targets index ea24357e50..88d4dc59ba 100644 --- a/eng/targets/Npm.Common.targets +++ b/eng/targets/Npm.Common.targets @@ -13,8 +13,9 @@ - - + + + diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 054de6b7ba..4b446c4553 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.1.7-build-20190109.2 -commithash:ac3a3419fc03baebde26ce4ea3abc86fd701271c +version:2.1.7-build-20190110.2 +commithash:00aefcfd284db33352f35bfa2c74c65f8580e372 diff --git a/src/SignalR/clients/ts/client-ts.npmproj b/src/SignalR/clients/ts/client-ts.npmproj index 1e6bad50b1..2080570b89 100644 --- a/src/SignalR/clients/ts/client-ts.npmproj +++ b/src/SignalR/clients/ts/client-ts.npmproj @@ -3,8 +3,15 @@ false + + false true + + + + + diff --git a/src/SignalR/clients/ts/common/package-lock.json b/src/SignalR/clients/ts/common/package-lock.json index 3ec871bf5e..baf3d32bb7 100644 --- a/src/SignalR/clients/ts/common/package-lock.json +++ b/src/SignalR/clients/ts/common/package-lock.json @@ -2656,14 +2656,12 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -2678,20 +2676,17 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -2808,8 +2803,7 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -2821,7 +2815,6 @@ "version": "1.0.0", "bundled": true, "dev": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -2836,7 +2829,6 @@ "version": "3.0.4", "bundled": true, "dev": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -2844,14 +2836,12 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "minipass": { "version": "2.2.4", "bundled": true, "dev": true, - "optional": true, "requires": { "safe-buffer": "^5.1.1", "yallist": "^3.0.0" @@ -2870,7 +2860,6 @@ "version": "0.5.1", "bundled": true, "dev": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -2951,8 +2940,7 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "object-assign": { "version": "4.1.1", @@ -2964,7 +2952,6 @@ "version": "1.4.0", "bundled": true, "dev": true, - "optional": true, "requires": { "wrappy": "1" } @@ -3086,7 +3073,6 @@ "version": "1.0.2", "bundled": true, "dev": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", From 1677ed2073f8c16711dc1a3bb32812c6b71c4afd Mon Sep 17 00:00:00 2001 From: Mikael Mengistu Date: Thu, 10 Jan 2019 15:54:13 -0800 Subject: [PATCH 03/15] Package Archive Baseline for the 2.1.8 Patch (#6578) --- .../ArchiveBaseline.2.1.7.txt | 206 ++++++++++++++++++ .../ArchiveBaseline.2.1.7.txt | 198 +++++++++++++++++ 2 files changed, 404 insertions(+) create mode 100644 src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.7.txt create mode 100644 src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.7.txt diff --git a/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.7.txt b/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.7.txt new file mode 100644 index 0000000000..3415c1024c --- /dev/null +++ b/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.7.txt @@ -0,0 +1,206 @@ +microsoft.extensions.platformabstractions\1.1.0\.signature.p7s +microsoft.visualstudio.web.codegeneration.contracts\2.1.7\.nupkg.metadata +microsoft.visualstudio.web.codegeneration.contracts\2.1.7\.signature.p7s +microsoft.visualstudio.web.codegeneration.contracts\2.1.7\lib\netstandard2.0\Microsoft.VisualStudio.Web.CodeGeneration.Contracts.dll +microsoft.visualstudio.web.codegeneration.contracts\2.1.7\microsoft.visualstudio.web.codegeneration.contracts.2.1.7.nupkg +microsoft.visualstudio.web.codegeneration.contracts\2.1.7\microsoft.visualstudio.web.codegeneration.contracts.2.1.7.nupkg.sha512 +microsoft.visualstudio.web.codegeneration.contracts\2.1.7\microsoft.visualstudio.web.codegeneration.contracts.nuspec +microsoft.visualstudio.web.codegeneration.core\2.1.7\.nupkg.metadata +microsoft.visualstudio.web.codegeneration.core\2.1.7\.signature.p7s +microsoft.visualstudio.web.codegeneration.core\2.1.7\lib\netstandard2.0\Microsoft.VisualStudio.Web.CodeGeneration.Core.dll +microsoft.visualstudio.web.codegeneration.core\2.1.7\microsoft.visualstudio.web.codegeneration.core.2.1.7.nupkg +microsoft.visualstudio.web.codegeneration.core\2.1.7\microsoft.visualstudio.web.codegeneration.core.2.1.7.nupkg.sha512 +microsoft.visualstudio.web.codegeneration.core\2.1.7\microsoft.visualstudio.web.codegeneration.core.nuspec +microsoft.visualstudio.web.codegeneration.design\2.1.7\.nupkg.metadata +microsoft.visualstudio.web.codegeneration.design\2.1.7\.signature.p7s +microsoft.visualstudio.web.codegeneration.design\2.1.7\lib\net461\dotnet-aspnet-codegenerator-design.exe +microsoft.visualstudio.web.codegeneration.design\2.1.7\lib\netstandard2.0\dotnet-aspnet-codegenerator-design.dll +microsoft.visualstudio.web.codegeneration.design\2.1.7\microsoft.visualstudio.web.codegeneration.design.2.1.7.nupkg +microsoft.visualstudio.web.codegeneration.design\2.1.7\microsoft.visualstudio.web.codegeneration.design.2.1.7.nupkg.sha512 +microsoft.visualstudio.web.codegeneration.design\2.1.7\microsoft.visualstudio.web.codegeneration.design.nuspec +microsoft.visualstudio.web.codegeneration.design\2.1.7\runtimes\win7-x64\lib\net461\dotnet-aspnet-codegenerator-design.exe +microsoft.visualstudio.web.codegeneration.design\2.1.7\runtimes\win7-x86\lib\net461\dotnet-aspnet-codegenerator-design.exe +microsoft.visualstudio.web.codegeneration.design\2.1.7\runtimes\win-arm\lib\net461\dotnet-aspnet-codegenerator-design.exe +microsoft.visualstudio.web.codegeneration.design\2.1.7\runtimes\win-arm64\lib\net461\dotnet-aspnet-codegenerator-design.exe +microsoft.visualstudio.web.codegeneration.entityframeworkcore\2.1.7\.nupkg.metadata +microsoft.visualstudio.web.codegeneration.entityframeworkcore\2.1.7\.signature.p7s +microsoft.visualstudio.web.codegeneration.entityframeworkcore\2.1.7\lib\netstandard2.0\Microsoft.VisualStudio.Web.CodeGeneration.EntityFrameworkCore.dll +microsoft.visualstudio.web.codegeneration.entityframeworkcore\2.1.7\microsoft.visualstudio.web.codegeneration.entityframeworkcore.2.1.7.nupkg +microsoft.visualstudio.web.codegeneration.entityframeworkcore\2.1.7\microsoft.visualstudio.web.codegeneration.entityframeworkcore.2.1.7.nupkg.sha512 +microsoft.visualstudio.web.codegeneration.entityframeworkcore\2.1.7\microsoft.visualstudio.web.codegeneration.entityframeworkcore.nuspec +microsoft.visualstudio.web.codegeneration.entityframeworkcore\2.1.7\Templates\DbContext\NewLocalDbContext.cshtml +microsoft.visualstudio.web.codegeneration.templating\2.1.7\.nupkg.metadata +microsoft.visualstudio.web.codegeneration.templating\2.1.7\.signature.p7s +microsoft.visualstudio.web.codegeneration.templating\2.1.7\lib\netstandard2.0\Microsoft.VisualStudio.Web.CodeGeneration.Templating.dll +microsoft.visualstudio.web.codegeneration.templating\2.1.7\microsoft.visualstudio.web.codegeneration.templating.2.1.7.nupkg +microsoft.visualstudio.web.codegeneration.templating\2.1.7\microsoft.visualstudio.web.codegeneration.templating.2.1.7.nupkg.sha512 +microsoft.visualstudio.web.codegeneration.templating\2.1.7\microsoft.visualstudio.web.codegeneration.templating.nuspec +microsoft.visualstudio.web.codegeneration.utils\2.1.7\.nupkg.metadata +microsoft.visualstudio.web.codegeneration.utils\2.1.7\.signature.p7s +microsoft.visualstudio.web.codegeneration.utils\2.1.7\lib\netstandard2.0\Microsoft.VisualStudio.Web.CodeGeneration.Utils.dll +microsoft.visualstudio.web.codegeneration.utils\2.1.7\microsoft.visualstudio.web.codegeneration.utils.2.1.7.nupkg +microsoft.visualstudio.web.codegeneration.utils\2.1.7\microsoft.visualstudio.web.codegeneration.utils.2.1.7.nupkg.sha512 +microsoft.visualstudio.web.codegeneration.utils\2.1.7\microsoft.visualstudio.web.codegeneration.utils.nuspec +microsoft.visualstudio.web.codegeneration\2.1.7\.nupkg.metadata +microsoft.visualstudio.web.codegeneration\2.1.7\.signature.p7s +microsoft.visualstudio.web.codegeneration\2.1.7\lib\netstandard2.0\Microsoft.VisualStudio.Web.CodeGeneration.dll +microsoft.visualstudio.web.codegeneration\2.1.7\microsoft.visualstudio.web.codegeneration.2.1.7.nupkg +microsoft.visualstudio.web.codegeneration\2.1.7\microsoft.visualstudio.web.codegeneration.2.1.7.nupkg.sha512 +microsoft.visualstudio.web.codegeneration\2.1.7\microsoft.visualstudio.web.codegeneration.nuspec +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\.nupkg.metadata +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\.signature.p7s +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Generators\ParameterDefinitions\area.json +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Generators\ParameterDefinitions\controller.json +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Generators\ParameterDefinitions\identity.json +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Generators\ParameterDefinitions\razorpage.json +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Generators\ParameterDefinitions\view.json +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\lib\netstandard2.0\identitygeneratorfilesconfig.json +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\lib\netstandard2.0\Microsoft.VisualStudio.Web.CodeGenerators.Mvc.dll +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\microsoft.visualstudio.web.codegenerators.mvc.2.1.7.nupkg +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\microsoft.visualstudio.web.codegenerators.mvc.2.1.7.nupkg.sha512 +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\microsoft.visualstudio.web.codegenerators.mvc.nuspec +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\ControllerGenerator\ApiControllerWithActions.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\ControllerGenerator\ApiControllerWithContext.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\ControllerGenerator\ApiEmptyController.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\ControllerGenerator\ControllerWithActions.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\ControllerGenerator\EmptyController.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\ControllerGenerator\MvcControllerWithContext.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\_LoginPartial.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Data\ApplicationDbContext.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Data\ApplicationUser.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\IdentityHostingStartup.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\_Layout.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\_ValidationScriptsPartial.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\_ViewImports.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\_ViewStart.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Account._ViewImports.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Account.AccessDenied.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Account.AccessDenied.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Account.ConfirmEmail.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Account.ConfirmEmail.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Account.ExternalLogin.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Account.ExternalLogin.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Account.ForgotPassword.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Account.ForgotPassword.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Account.ForgotPasswordConfirmation.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Account.ForgotPasswordConfirmation.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Account.Lockout.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Account.Lockout.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Account.Login.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Account.Login.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Account.LoginWith2fa.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Account.LoginWith2fa.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Account.LoginWithRecoveryCode.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Account.LoginWithRecoveryCode.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Account.Logout.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Account.Logout.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Account.Register.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Account.Register.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Account.ResetPassword.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Account.ResetPassword.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Account.ResetPasswordConfirmation.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Account.ResetPasswordConfirmation.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Manage\Account.Manage._Layout.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Manage\Account.Manage._ManageNav.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Manage\Account.Manage._StatusMessage.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Manage\Account.Manage._ViewImports.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Manage\Account.Manage.ChangePassword.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Manage\Account.Manage.ChangePassword.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Manage\Account.Manage.DeletePersonalData.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Manage\Account.Manage.DeletePersonalData.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Manage\Account.Manage.Disable2fa.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Manage\Account.Manage.Disable2fa.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Manage\Account.Manage.DownloadPersonalData.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Manage\Account.Manage.DownloadPersonalData.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Manage\Account.Manage.EnableAuthenticator.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Manage\Account.Manage.EnableAuthenticator.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Manage\Account.Manage.ExternalLogins.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Manage\Account.Manage.ExternalLogins.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Manage\Account.Manage.GenerateRecoveryCodes.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Manage\Account.Manage.GenerateRecoveryCodes.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Manage\Account.Manage.Index.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Manage\Account.Manage.Index.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Manage\Account.Manage.ManageNavPages.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Manage\Account.Manage.PersonalData.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Manage\Account.Manage.PersonalData.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Manage\Account.Manage.ResetAuthenticator.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Manage\Account.Manage.ResetAuthenticator.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Manage\Account.Manage.SetPassword.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Manage\Account.Manage.SetPassword.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Manage\Account.Manage.ShowRecoveryCodes.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Manage\Account.Manage.ShowRecoveryCodes.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Manage\Account.Manage.TwoFactorAuthentication.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Manage\Account.Manage.TwoFactorAuthentication.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Error.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Error.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\ScaffoldingReadme.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\SupportPages._CookieConsentPartial.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\SupportPages._ViewImports.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\SupportPages._ViewStart.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\css\site.css +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\css\site.min.css +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\favicon.ico +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\images\banner1.svg +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\images\banner2.svg +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\images\banner3.svg +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\js\site.js +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\js\site.min.js +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\lib\bootstrap\.bower.json +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\lib\bootstrap\dist\css\bootstrap.css +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\lib\bootstrap\dist\css\bootstrap.css.map +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\lib\bootstrap\dist\css\bootstrap.min.css +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\lib\bootstrap\dist\css\bootstrap.min.css.map +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\lib\bootstrap\dist\css\bootstrap-theme.css +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\lib\bootstrap\dist\css\bootstrap-theme.css.map +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\lib\bootstrap\dist\css\bootstrap-theme.min.css +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\lib\bootstrap\dist\css\bootstrap-theme.min.css.map +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\lib\bootstrap\dist\fonts\glyphicons-halflings-regular.eot +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\lib\bootstrap\dist\fonts\glyphicons-halflings-regular.svg +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\lib\bootstrap\dist\fonts\glyphicons-halflings-regular.ttf +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\lib\bootstrap\dist\fonts\glyphicons-halflings-regular.woff +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\lib\bootstrap\dist\fonts\glyphicons-halflings-regular.woff2 +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\lib\bootstrap\dist\js\bootstrap.js +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\lib\bootstrap\dist\js\bootstrap.min.js +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\lib\bootstrap\dist\js\npm.js +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\lib\bootstrap\LICENSE +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\lib\jquery\.bower.json +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\lib\jquery\dist\jquery.js +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\lib\jquery\dist\jquery.min.js +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\lib\jquery\dist\jquery.min.map +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\lib\jquery\LICENSE.txt +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\lib\jquery-validation\.bower.json +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\lib\jquery-validation\dist\additional-methods.js +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\lib\jquery-validation\dist\additional-methods.min.js +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\lib\jquery-validation\dist\jquery.validate.js +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\lib\jquery-validation\dist\jquery.validate.min.js +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\lib\jquery-validation\LICENSE.md +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\lib\jquery-validation-unobtrusive\.bower.json +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\lib\jquery-validation-unobtrusive\jquery.validate.unobtrusive.js +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\lib\jquery-validation-unobtrusive\jquery.validate.unobtrusive.min.js +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\lib\jquery-validation-unobtrusive\LICENSE.txt +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\MvcLayout\_Layout.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\MvcLayout\Error.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\RazorPageGenerator\_ValidationScriptsPartial.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\RazorPageGenerator\Create.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\RazorPageGenerator\CreatePageModel.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\RazorPageGenerator\Delete.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\RazorPageGenerator\DeletePageModel.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\RazorPageGenerator\Details.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\RazorPageGenerator\DetailsPageModel.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\RazorPageGenerator\Edit.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\RazorPageGenerator\EditPageModel.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\RazorPageGenerator\Empty.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\RazorPageGenerator\EmptyPageModel.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\RazorPageGenerator\List.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\RazorPageGenerator\ListPageModel.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Startup\ReadMe.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Startup\Startup.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\ViewGenerator\_ValidationScriptsPartial.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\ViewGenerator\Create.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\ViewGenerator\Delete.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\ViewGenerator\Details.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\ViewGenerator\Edit.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\ViewGenerator\Empty.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\ViewGenerator\List.cshtml +system.composition.hosting\1.0.31\.signature.p7s +system.composition\1.0.31\.signature.p7s diff --git a/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.7.txt b/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.7.txt new file mode 100644 index 0000000000..0875cca7d0 --- /dev/null +++ b/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.7.txt @@ -0,0 +1,198 @@ +microsoft.extensions.platformabstractions\1.1.0\.signature.p7s +microsoft.visualstudio.web.codegeneration.contracts\2.1.7\.nupkg.metadata +microsoft.visualstudio.web.codegeneration.contracts\2.1.7\.signature.p7s +microsoft.visualstudio.web.codegeneration.contracts\2.1.7\lib\netstandard2.0\Microsoft.VisualStudio.Web.CodeGeneration.Contracts.dll +microsoft.visualstudio.web.codegeneration.contracts\2.1.7\microsoft.visualstudio.web.codegeneration.contracts.2.1.7.nupkg.sha512 +microsoft.visualstudio.web.codegeneration.contracts\2.1.7\microsoft.visualstudio.web.codegeneration.contracts.nuspec +microsoft.visualstudio.web.codegeneration.core\2.1.7\.nupkg.metadata +microsoft.visualstudio.web.codegeneration.core\2.1.7\.signature.p7s +microsoft.visualstudio.web.codegeneration.core\2.1.7\lib\netstandard2.0\Microsoft.VisualStudio.Web.CodeGeneration.Core.dll +microsoft.visualstudio.web.codegeneration.core\2.1.7\microsoft.visualstudio.web.codegeneration.core.2.1.7.nupkg.sha512 +microsoft.visualstudio.web.codegeneration.core\2.1.7\microsoft.visualstudio.web.codegeneration.core.nuspec +microsoft.visualstudio.web.codegeneration.design\2.1.7\.nupkg.metadata +microsoft.visualstudio.web.codegeneration.design\2.1.7\.signature.p7s +microsoft.visualstudio.web.codegeneration.design\2.1.7\lib\net461\dotnet-aspnet-codegenerator-design.exe +microsoft.visualstudio.web.codegeneration.design\2.1.7\lib\netstandard2.0\dotnet-aspnet-codegenerator-design.dll +microsoft.visualstudio.web.codegeneration.design\2.1.7\microsoft.visualstudio.web.codegeneration.design.2.1.7.nupkg.sha512 +microsoft.visualstudio.web.codegeneration.design\2.1.7\microsoft.visualstudio.web.codegeneration.design.nuspec +microsoft.visualstudio.web.codegeneration.design\2.1.7\runtimes\win7-x64\lib\net461\dotnet-aspnet-codegenerator-design.exe +microsoft.visualstudio.web.codegeneration.design\2.1.7\runtimes\win7-x86\lib\net461\dotnet-aspnet-codegenerator-design.exe +microsoft.visualstudio.web.codegeneration.design\2.1.7\runtimes\win-arm\lib\net461\dotnet-aspnet-codegenerator-design.exe +microsoft.visualstudio.web.codegeneration.design\2.1.7\runtimes\win-arm64\lib\net461\dotnet-aspnet-codegenerator-design.exe +microsoft.visualstudio.web.codegeneration.entityframeworkcore\2.1.7\.nupkg.metadata +microsoft.visualstudio.web.codegeneration.entityframeworkcore\2.1.7\.signature.p7s +microsoft.visualstudio.web.codegeneration.entityframeworkcore\2.1.7\lib\netstandard2.0\Microsoft.VisualStudio.Web.CodeGeneration.EntityFrameworkCore.dll +microsoft.visualstudio.web.codegeneration.entityframeworkcore\2.1.7\microsoft.visualstudio.web.codegeneration.entityframeworkcore.2.1.7.nupkg.sha512 +microsoft.visualstudio.web.codegeneration.entityframeworkcore\2.1.7\microsoft.visualstudio.web.codegeneration.entityframeworkcore.nuspec +microsoft.visualstudio.web.codegeneration.entityframeworkcore\2.1.7\Templates\DbContext\NewLocalDbContext.cshtml +microsoft.visualstudio.web.codegeneration.templating\2.1.7\.nupkg.metadata +microsoft.visualstudio.web.codegeneration.templating\2.1.7\.signature.p7s +microsoft.visualstudio.web.codegeneration.templating\2.1.7\lib\netstandard2.0\Microsoft.VisualStudio.Web.CodeGeneration.Templating.dll +microsoft.visualstudio.web.codegeneration.templating\2.1.7\microsoft.visualstudio.web.codegeneration.templating.2.1.7.nupkg.sha512 +microsoft.visualstudio.web.codegeneration.templating\2.1.7\microsoft.visualstudio.web.codegeneration.templating.nuspec +microsoft.visualstudio.web.codegeneration.utils\2.1.7\.nupkg.metadata +microsoft.visualstudio.web.codegeneration.utils\2.1.7\.signature.p7s +microsoft.visualstudio.web.codegeneration.utils\2.1.7\lib\netstandard2.0\Microsoft.VisualStudio.Web.CodeGeneration.Utils.dll +microsoft.visualstudio.web.codegeneration.utils\2.1.7\microsoft.visualstudio.web.codegeneration.utils.2.1.7.nupkg.sha512 +microsoft.visualstudio.web.codegeneration.utils\2.1.7\microsoft.visualstudio.web.codegeneration.utils.nuspec +microsoft.visualstudio.web.codegeneration\2.1.7\.nupkg.metadata +microsoft.visualstudio.web.codegeneration\2.1.7\.signature.p7s +microsoft.visualstudio.web.codegeneration\2.1.7\lib\netstandard2.0\Microsoft.VisualStudio.Web.CodeGeneration.dll +microsoft.visualstudio.web.codegeneration\2.1.7\microsoft.visualstudio.web.codegeneration.2.1.7.nupkg.sha512 +microsoft.visualstudio.web.codegeneration\2.1.7\microsoft.visualstudio.web.codegeneration.nuspec +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\.nupkg.metadata +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\.signature.p7s +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Generators\ParameterDefinitions\area.json +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Generators\ParameterDefinitions\controller.json +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Generators\ParameterDefinitions\identity.json +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Generators\ParameterDefinitions\razorpage.json +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Generators\ParameterDefinitions\view.json +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\lib\netstandard2.0\identitygeneratorfilesconfig.json +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\lib\netstandard2.0\Microsoft.VisualStudio.Web.CodeGenerators.Mvc.dll +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\microsoft.visualstudio.web.codegenerators.mvc.2.1.7.nupkg.sha512 +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\microsoft.visualstudio.web.codegenerators.mvc.nuspec +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\ControllerGenerator\ApiControllerWithActions.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\ControllerGenerator\ApiControllerWithContext.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\ControllerGenerator\ApiEmptyController.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\ControllerGenerator\ControllerWithActions.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\ControllerGenerator\EmptyController.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\ControllerGenerator\MvcControllerWithContext.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\_LoginPartial.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Data\ApplicationDbContext.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Data\ApplicationUser.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\IdentityHostingStartup.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\_Layout.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\_ValidationScriptsPartial.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\_ViewImports.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\_ViewStart.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Account._ViewImports.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Account.AccessDenied.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Account.AccessDenied.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Account.ConfirmEmail.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Account.ConfirmEmail.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Account.ExternalLogin.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Account.ExternalLogin.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Account.ForgotPassword.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Account.ForgotPassword.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Account.ForgotPasswordConfirmation.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Account.ForgotPasswordConfirmation.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Account.Lockout.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Account.Lockout.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Account.Login.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Account.Login.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Account.LoginWith2fa.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Account.LoginWith2fa.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Account.LoginWithRecoveryCode.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Account.LoginWithRecoveryCode.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Account.Logout.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Account.Logout.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Account.Register.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Account.Register.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Account.ResetPassword.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Account.ResetPassword.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Account.ResetPasswordConfirmation.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Account.ResetPasswordConfirmation.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Manage\Account.Manage._Layout.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Manage\Account.Manage._ManageNav.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Manage\Account.Manage._StatusMessage.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Manage\Account.Manage._ViewImports.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Manage\Account.Manage.ChangePassword.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Manage\Account.Manage.ChangePassword.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Manage\Account.Manage.DeletePersonalData.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Manage\Account.Manage.DeletePersonalData.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Manage\Account.Manage.Disable2fa.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Manage\Account.Manage.Disable2fa.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Manage\Account.Manage.DownloadPersonalData.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Manage\Account.Manage.DownloadPersonalData.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Manage\Account.Manage.EnableAuthenticator.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Manage\Account.Manage.EnableAuthenticator.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Manage\Account.Manage.ExternalLogins.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Manage\Account.Manage.ExternalLogins.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Manage\Account.Manage.GenerateRecoveryCodes.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Manage\Account.Manage.GenerateRecoveryCodes.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Manage\Account.Manage.Index.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Manage\Account.Manage.Index.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Manage\Account.Manage.ManageNavPages.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Manage\Account.Manage.PersonalData.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Manage\Account.Manage.PersonalData.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Manage\Account.Manage.ResetAuthenticator.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Manage\Account.Manage.ResetAuthenticator.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Manage\Account.Manage.SetPassword.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Manage\Account.Manage.SetPassword.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Manage\Account.Manage.ShowRecoveryCodes.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Manage\Account.Manage.ShowRecoveryCodes.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Manage\Account.Manage.TwoFactorAuthentication.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Account\Manage\Account.Manage.TwoFactorAuthentication.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Error.cs.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\Pages\Error.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\ScaffoldingReadme.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\SupportPages._CookieConsentPartial.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\SupportPages._ViewImports.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\SupportPages._ViewStart.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\css\site.css +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\css\site.min.css +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\favicon.ico +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\images\banner1.svg +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\images\banner2.svg +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\images\banner3.svg +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\js\site.js +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\js\site.min.js +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\lib\bootstrap\.bower.json +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\lib\bootstrap\dist\css\bootstrap.css +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\lib\bootstrap\dist\css\bootstrap.css.map +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\lib\bootstrap\dist\css\bootstrap.min.css +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\lib\bootstrap\dist\css\bootstrap.min.css.map +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\lib\bootstrap\dist\css\bootstrap-theme.css +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\lib\bootstrap\dist\css\bootstrap-theme.css.map +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\lib\bootstrap\dist\css\bootstrap-theme.min.css +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\lib\bootstrap\dist\css\bootstrap-theme.min.css.map +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\lib\bootstrap\dist\fonts\glyphicons-halflings-regular.eot +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\lib\bootstrap\dist\fonts\glyphicons-halflings-regular.svg +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\lib\bootstrap\dist\fonts\glyphicons-halflings-regular.ttf +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\lib\bootstrap\dist\fonts\glyphicons-halflings-regular.woff +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\lib\bootstrap\dist\fonts\glyphicons-halflings-regular.woff2 +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\lib\bootstrap\dist\js\bootstrap.js +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\lib\bootstrap\dist\js\bootstrap.min.js +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\lib\bootstrap\dist\js\npm.js +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\lib\bootstrap\LICENSE +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\lib\jquery\.bower.json +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\lib\jquery\dist\jquery.js +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\lib\jquery\dist\jquery.min.js +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\lib\jquery\dist\jquery.min.map +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\lib\jquery\LICENSE.txt +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\lib\jquery-validation\.bower.json +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\lib\jquery-validation\dist\additional-methods.js +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\lib\jquery-validation\dist\additional-methods.min.js +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\lib\jquery-validation\dist\jquery.validate.js +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\lib\jquery-validation\dist\jquery.validate.min.js +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\lib\jquery-validation\LICENSE.md +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\lib\jquery-validation-unobtrusive\.bower.json +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\lib\jquery-validation-unobtrusive\jquery.validate.unobtrusive.js +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\lib\jquery-validation-unobtrusive\jquery.validate.unobtrusive.min.js +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Identity\wwwroot\lib\jquery-validation-unobtrusive\LICENSE.txt +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\MvcLayout\_Layout.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\MvcLayout\Error.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\RazorPageGenerator\_ValidationScriptsPartial.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\RazorPageGenerator\Create.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\RazorPageGenerator\CreatePageModel.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\RazorPageGenerator\Delete.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\RazorPageGenerator\DeletePageModel.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\RazorPageGenerator\Details.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\RazorPageGenerator\DetailsPageModel.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\RazorPageGenerator\Edit.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\RazorPageGenerator\EditPageModel.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\RazorPageGenerator\Empty.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\RazorPageGenerator\EmptyPageModel.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\RazorPageGenerator\List.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\RazorPageGenerator\ListPageModel.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Startup\ReadMe.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\Startup\Startup.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\ViewGenerator\_ValidationScriptsPartial.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\ViewGenerator\Create.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\ViewGenerator\Delete.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\ViewGenerator\Details.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\ViewGenerator\Edit.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\ViewGenerator\Empty.cshtml +microsoft.visualstudio.web.codegenerators.mvc\2.1.7\Templates\ViewGenerator\List.cshtml +system.composition.hosting\1.0.31\.signature.p7s +system.composition\1.0.31\.signature.p7s From 3b67abecbfc9933d73bf26c8b88bd7167cf471b9 Mon Sep 17 00:00:00 2001 From: Ajay Bhargav Baaskaran Date: Thu, 10 Jan 2019 17:34:25 -0800 Subject: [PATCH 04/15] Add an MSBuild target to set MsBuild.exe path (#6401) * Add an MSBuild target to set MsBuild.exe path * Added a warning message * Don't build Razor.Tasks twice * Compile include inside the target --- .../Microsoft.AspNetCore.Razor.Design.csproj | 3 +- ...rosoft.AspNetCore.Razor.Design.Test.csproj | 29 ++++++++++++++++--- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/src/Razor/Razor.Design/src/Microsoft.AspNetCore.Razor.Design.csproj b/src/Razor/Razor.Design/src/Microsoft.AspNetCore.Razor.Design.csproj index e7281a385b..f23d5997d8 100644 --- a/src/Razor/Razor.Design/src/Microsoft.AspNetCore.Razor.Design.csproj +++ b/src/Razor/Razor.Design/src/Microsoft.AspNetCore.Razor.Design.csproj @@ -35,7 +35,6 @@ - _BuildDependencyProjects;$(GenerateNuspecDependsOn) _BuildDependencyProjects;$(BuildDependsOn) @@ -92,7 +91,7 @@ - + diff --git a/src/Razor/Razor.Design/test/IntegrationTests/Microsoft.AspNetCore.Razor.Design.Test.csproj b/src/Razor/Razor.Design/test/IntegrationTests/Microsoft.AspNetCore.Razor.Design.Test.csproj index ed52a3b2b6..b27dca6270 100644 --- a/src/Razor/Razor.Design/test/IntegrationTests/Microsoft.AspNetCore.Razor.Design.Test.csproj +++ b/src/Razor/Razor.Design/test/IntegrationTests/Microsoft.AspNetCore.Razor.Design.Test.csproj @@ -13,12 +13,10 @@ true $(MSBuildProjectDirectory)\obj\BuildVariables.generated.cs - EnsureBuildVariablesGeneratedFile;$(CompileDependsOn) - @@ -35,8 +33,31 @@ - - + + + + + +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests +{ + internal static partial class BuildVariables + { + static partial void InitializeVariables() + { + _msBuildPath = @"$(MSBuildBinPath)\MSBuild.exe"%3B + } + } +} + + + + + + From abfdb433f2f9f63c213ef3cce60814a9d8f9c0be Mon Sep 17 00:00:00 2001 From: Mikael Mengistu Date: Fri, 11 Jan 2019 09:59:03 -0800 Subject: [PATCH 05/15] Update submodules.props (#6586) * Update submodules.props * Update EF submodule --- build/submodules.props | 5 +---- modules/EntityFrameworkCore | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/build/submodules.props b/build/submodules.props index 254c4426a7..a9ded11773 100644 --- a/build/submodules.props +++ b/build/submodules.props @@ -38,12 +38,9 @@ + - - - - diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore index d53e0ab015..0cde562cc0 160000 --- a/modules/EntityFrameworkCore +++ b/modules/EntityFrameworkCore @@ -1 +1 @@ -Subproject commit d53e0ab01598cb05592aee7809e16d6bf55a4e14 +Subproject commit 0cde562cc070fd00ecf33248df715f6df58a1691 From b4f869b2ffabade014522b3eda7b8b5624e98fcb Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 11 Jan 2019 16:23:13 -0800 Subject: [PATCH 06/15] Switch agent queues used on Windows builds (#6627) --- .azure/pipelines/jobs/default-build.yml | 35 +++++++++++-------- eng/scripts/InstallJdk.ps1 | 27 ++++++++++++++ eng/scripts/common.psm1 | 1 + run.ps1 | 1 + scripts/common.psm1 | 1 + src/Middleware/WebSockets/setup-wstest.ps1 | 3 +- .../IIS/tools/SetupTestEnvironment.ps1 | 3 +- test/Cli.FunctionalTests/run-tests.ps1 | 1 + 8 files changed, 55 insertions(+), 17 deletions(-) create mode 100644 eng/scripts/InstallJdk.ps1 diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml index ff9e12135a..dc8c7d1eb6 100644 --- a/.azure/pipelines/jobs/default-build.yml +++ b/.azure/pipelines/jobs/default-build.yml @@ -27,8 +27,6 @@ # A map of custom variables # matrix: { string: { string: string } } # A map of matrix configurations and variables. https://docs.microsoft.com/en-us/vsts/pipelines/yaml-schema?view=vsts#matrix -# demands: string | [ string ] -# A list of agent demands. https://docs.microsoft.com/en-us/vsts/pipelines/yaml-schema?view=vsts#demands # dependsOn: string | [ string ] # For fan-out/fan-in. https://docs.microsoft.com/en-us/vsts/pipelines/yaml-schema?view=vsts#phase # codeSign: boolean @@ -45,7 +43,6 @@ parameters: poolName: '' buildArgs: '' configuration: 'Release' - demands: [] beforeBuild: [] afterBuild: [] codeSign: false @@ -71,6 +68,7 @@ jobs: maxParallel: 8 matrix: ${{ parameters.matrix }} # Map friendly OS names to the right queue + # See https://github.com/dotnet/arcade/blob/master/Documentation/ChoosingAMachinePool.md pool: ${{ if ne(parameters.poolName, '') }}: name: ${{ parameters.poolName }} @@ -81,24 +79,25 @@ jobs: name: Hosted Ubuntu 1604 vmImage: ubuntu-16.04 ${{ if and(eq(parameters.poolName, ''), eq(parameters.agentOs, 'Windows')) }}: - ${{ if ne(parameters.codeSign, 'true') }}: - name: Hosted VS2017 - vmImage: vs2017-win2016 - ${{ if eq(parameters.codeSign, 'true') }}: - name: DotNetCore-Windows + ${{ if eq(variables['System.TeamProject'], 'internal') }}: + name: dotnet-internal-temp + ${{ if ne(variables['System.TeamProject'], 'internal') }}: + name: dotnet-external-temp variables: AgentOsName: ${{ parameters.agentOs }} ASPNETCORE_TEST_LOG_MAXPATH: "200" # Keep test log file name length low enough for artifact zipping - DOTNET_HOME: $(Agent.WorkFolder)/.dotnet + DOTNET_HOME: $(Agent.BuildDirectory)/.dotnet + BuildScript: ${{ parameters.buildScript }} BuildScriptArgs: ${{ parameters.buildArgs }} BuildConfiguration: ${{ parameters.configuration }} BuildDirectory: ${{ parameters.buildDirectory }} - VSTS_OVERWRITE_TEMP: false # Workaround for https://github.com/dotnet/core-eng/issues/2812 - ${{ if eq(parameters.codeSign, 'true') }}: + ${{ if eq(parameters.agentOs, 'Windows') }}: + JAVA_HOME: $(Agent.BuildDirectory)\.tools\jdk + ${{ if or(ne(parameters.codeSign, 'true'), ne(variables['System.TeamProject'], 'internal')) }}: + _SignType: + ${{ if and(eq(parameters.codeSign, 'true'), eq(variables['System.TeamProject'], 'internal')) }}: TeamName: AspNetCore _SignType: real - ${{ if ne(parameters.codeSign, 'true') }}: - _SignType: ${{ insert }}: ${{ parameters.variables }} steps: - checkout: self @@ -107,13 +106,17 @@ jobs: displayName: Install Node 10.x inputs: versionSpec: 10.x - - ${{ if and(eq(parameters.agentOs, 'Windows'), eq(parameters.codeSign, 'true')) }}: + - ${{ if eq(parameters.agentOs, 'Windows') }}: + - powershell: ./eng/scripts/InstallJdk.ps1 '11.0.1' + displayName: Install JDK 11 + - ${{ if and(eq(variables['System.TeamProject'], 'internal'), eq(parameters.agentOs, 'Windows'), eq(parameters.codeSign, 'true')) }}: - task: MicroBuildSigningPlugin@1 displayName: Install MicroBuild Signing plugin condition: and(succeeded(), in(variables['_SignType'], 'test', 'real')) inputs: signType: $(_SignType) zipSources: false + feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json - ${{ parameters.beforeBuild }} - ${{ if eq(parameters.agentOs, 'Windows') }}: - script: .\$(BuildDirectory)\build.cmd -ci /p:SignType=$(_SignType) /p:Configuration=$(BuildConfiguration) $(BuildScriptArgs) @@ -124,6 +127,7 @@ jobs: - task: PublishTestResults@2 displayName: Publish test results condition: always() + continueOnError: true inputs: testRunTitle: $(AgentOsName)-$(BuildConfiguration) testRunner: vstest @@ -133,6 +137,7 @@ jobs: - task: PublishBuildArtifacts@1 displayName: Upload artifacts condition: eq(variables['system.pullrequest.isfork'], false) + continueOnError: true inputs: ${{ if eq(parameters.buildDirectory, '') }}: pathtoPublish: ${{ parameters.artifacts.path }} @@ -145,7 +150,7 @@ jobs: artifactType: Container parallel: true - ${{ parameters.afterBuild }} - - ${{ if and(eq(parameters.agentOs, 'Windows'), eq(parameters.codeSign, 'true')) }}: + - ${{ if and(eq(variables['System.TeamProject'], 'internal'), eq(parameters.agentOs, 'Windows')) }}: - task: MicroBuildCleanup@1 displayName: Cleanup MicroBuild tasks condition: always() diff --git a/eng/scripts/InstallJdk.ps1 b/eng/scripts/InstallJdk.ps1 new file mode 100644 index 0000000000..ba76964e17 --- /dev/null +++ b/eng/scripts/InstallJdk.ps1 @@ -0,0 +1,27 @@ + +param( + [Parameter(Mandatory = $true)] + $JdkVersion + ) + +$ErrorActionPreference = 'Stop' +$ProgressPreference = 'SilentlyContinue' # Workaround PowerShell/PowerShell#2138 + +Set-StrictMode -Version 1 + +if (-not $env:JAVA_HOME) { + throw 'You must set the JAVA_HOME environment variable to the destination of the JDK.' +} + +$repoRoot = Resolve-Path "$PSScriptRoot/../.." +$tempDir = "$repoRoot/obj" +mkdir $tempDir -ea Ignore | out-null +Write-Host "Starting download of JDK ${JdkVersion}" +Invoke-WebRequest -UseBasicParsing -Uri "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/java/jdk-${JdkVersion}_windows-x64_bin.zip" -Out "$tempDir/jdk.zip" +Write-Host "Done downloading JDK ${JdkVersion}" +Expand-Archive "$tempDir/jdk.zip" -d "$tempDir/jdk/" +Write-Host "Expanded JDK to $tempDir" +mkdir (split-path -parent $env:JAVA_HOME) -ea ignore | out-null +Write-Host "Installing JDK to $env:JAVA_HOME" +Move-Item "$tempDir/jdk/jdk-${jdkVersion}" $env:JAVA_HOME +Write-Host "Done installing JDK to $env:JAVA_HOME" diff --git a/eng/scripts/common.psm1 b/eng/scripts/common.psm1 index 96544dc6f2..42c36bd09e 100644 --- a/eng/scripts/common.psm1 +++ b/eng/scripts/common.psm1 @@ -62,6 +62,7 @@ function Get-RemoteFile([string]$RemotePath, [string]$LocalPath) { while ($retries -gt 0) { $retries -= 1 try { + $ProgressPreference = 'SilentlyContinue' # Workaround PowerShell/PowerShell#2138 Invoke-WebRequest -UseBasicParsing -Uri $RemotePath -OutFile $LocalPath return } diff --git a/run.ps1 b/run.ps1 index 955a61c7e7..31aba9f045 100644 --- a/run.ps1 +++ b/run.ps1 @@ -172,6 +172,7 @@ function Get-RemoteFile([string]$RemotePath, [string]$LocalPath) { while ($retries -gt 0) { $retries -= 1 try { + $ProgressPreference = 'SilentlyContinue' # Workaround PowerShell/PowerShell#2138 Invoke-WebRequest -UseBasicParsing -Uri $RemotePath -OutFile $LocalPath return } diff --git a/scripts/common.psm1 b/scripts/common.psm1 index c547cba9a9..a8b20151c7 100644 --- a/scripts/common.psm1 +++ b/scripts/common.psm1 @@ -141,6 +141,7 @@ function Ensure-Hub() { mkdir -Path $tmpDir -ErrorAction Ignore | Out-Null + $ProgressPreference = 'SilentlyContinue' # Workaround PowerShell/PowerShell#2138 Invoke-WebRequest -OutFile $zipLocation -Uri $source Expand-Archive -Path $zipLocation -DestinationPath $zipDir -Force diff --git a/src/Middleware/WebSockets/setup-wstest.ps1 b/src/Middleware/WebSockets/setup-wstest.ps1 index 8571e77055..3c3981a0a6 100644 --- a/src/Middleware/WebSockets/setup-wstest.ps1 +++ b/src/Middleware/WebSockets/setup-wstest.ps1 @@ -14,6 +14,7 @@ $WsTest = Join-Path $ScriptsDir "wstest.exe" $VCPythonMsi = Join-Path $VendorDir "VCForPython27.msi" if(!(Test-Path $VCPythonMsi)) { Write-Host "Downloading VCForPython27.msi" + $ProgressPreference = 'SilentlyContinue' # Workaround PowerShell/PowerShell#2138 Invoke-WebRequest -Uri https://download.microsoft.com/download/7/9/6/796EF2E4-801B-4FC4-AB28-B59FBF6D907B/VCForPython27.msi -OutFile "$VCPythonMsi" } else { @@ -49,4 +50,4 @@ virtualenv $VirtualEnvDir # Install autobahn into the virtualenv & "$ScriptsDir\pip" install autobahntestsuite -Write-Host "Using wstest from: '$WsTest'" \ No newline at end of file +Write-Host "Using wstest from: '$WsTest'" diff --git a/src/Servers/IIS/tools/SetupTestEnvironment.ps1 b/src/Servers/IIS/tools/SetupTestEnvironment.ps1 index 3adaf79045..e80372f183 100644 --- a/src/Servers/IIS/tools/SetupTestEnvironment.ps1 +++ b/src/Servers/IIS/tools/SetupTestEnvironment.ps1 @@ -94,6 +94,7 @@ function Shutdown-Dumps() { $downloadedFile = [System.IO.Path]::GetTempFileName(); $downloadedFile = "$downloadedFile.exe"; + $ProgressPreference = 'SilentlyContinue' # Workaround PowerShell/PowerShell#2138 Invoke-WebRequest -Uri "https://go.microsoft.com/fwlink/p/?linkid=870807" -OutFile $downloadedFile; & $downloadedFile /features OptionId.WindowsDesktopDebuggers /norestart /q; } @@ -132,4 +133,4 @@ if ($Mode -eq "Shutdown") Shutdown-Dumps; } -Exit 0; \ No newline at end of file +Exit 0; diff --git a/test/Cli.FunctionalTests/run-tests.ps1 b/test/Cli.FunctionalTests/run-tests.ps1 index e21ee72334..fe7e21eac5 100644 --- a/test/Cli.FunctionalTests/run-tests.ps1 +++ b/test/Cli.FunctionalTests/run-tests.ps1 @@ -139,6 +139,7 @@ try { $cliUrl = "$AssetRootUrl/Sdk/$sdkVersion/dotnet-sdk-$sdkVersion-$HostRid$archiveExt" $cliArchiveFile = "$PSScriptRoot/obj/dotnet$archiveExt" Write-Host "Downloading $cliUrl" + $ProgressPreference = 'SilentlyContinue' # Workaround PowerShell/PowerShell#2138 Invoke-WebRequest -UseBasicParsing "${cliUrl}${AccessTokenSuffix}" -OutFile $cliArchiveFile if ($archiveExt -eq '.zip') { Expand-Archive $cliArchiveFile -DestinationPath $dotnetRoot From a06b0e3968e8fa91cab5b677559a1f31f1e3dc2c Mon Sep 17 00:00:00 2001 From: Mikael Mengistu Date: Fri, 11 Jan 2019 16:57:45 -0800 Subject: [PATCH 07/15] Prep for 2.1.8 Patch (#6632) --- eng/PatchConfig.props | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props index 98eab4e8b6..5ce6494e43 100644 --- a/eng/PatchConfig.props +++ b/eng/PatchConfig.props @@ -13,12 +13,8 @@ Later on, this will be checked using this condition: $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - + - Microsoft.AspNetCore; - Microsoft.AspNetCore.Server.IISIntegration; - Microsoft.AspNetCore.Server.Kestrel.Core; - Microsoft.AspNetCore.WebSockets; From 8aa8c6b2b0838942710066a2fdf6fb675c5c604f Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Mon, 14 Jan 2019 08:42:53 -0800 Subject: [PATCH 08/15] Build branch logging SE in main build (#6312) --- build/AzureIntegration.targets | 30 ------- build/SharedFx.targets | 23 +++++ build/artifacts.props | 1 + build/repo.props | 3 + build/repo.targets | 5 +- .../LoggingBranch/Directory.Build.targets | 33 +++++++ .../LoggingBranch/LoggingBranch.csproj | 33 +++++++ .../Sdk/HostingStartup/HostingStartup.csproj | 13 +++ .../Sdk/HostingStartup/Program.cs | 7 ++ src/SiteExtensions/Sdk/SiteExtension.targets | 86 +++++++++++++++++++ version.props | 2 +- 11 files changed, 202 insertions(+), 34 deletions(-) delete mode 100644 build/AzureIntegration.targets create mode 100644 src/SiteExtensions/LoggingBranch/Directory.Build.targets create mode 100644 src/SiteExtensions/LoggingBranch/LoggingBranch.csproj create mode 100644 src/SiteExtensions/Sdk/HostingStartup/HostingStartup.csproj create mode 100644 src/SiteExtensions/Sdk/HostingStartup/Program.cs create mode 100644 src/SiteExtensions/Sdk/SiteExtension.targets diff --git a/build/AzureIntegration.targets b/build/AzureIntegration.targets deleted file mode 100644 index 8df9536eb7..0000000000 --- a/build/AzureIntegration.targets +++ /dev/null @@ -1,30 +0,0 @@ - - - $(MSBuildThisFileDirectory)..\modules\AzureIntegration\ - - - - - - AspNetUniverseBuildOffline=true; - RepositoryRoot=$(AzureIntegrationProjectRoot); - DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcesPropsPath); - DotNetPackageVersionPropsPath=$(GeneratedPackageVersionPropsPath); - BuildNumber=$(BuildNumber); - Configuration=$(Configuration); - IsFinalBuild=$(IsFinalBuild); - - - - - - - - - - - - - diff --git a/build/SharedFx.targets b/build/SharedFx.targets index 828b62606e..8c0617bb9e 100644 --- a/build/SharedFx.targets +++ b/build/SharedFx.targets @@ -43,6 +43,7 @@ $(CommonProps);AspNetUniverseBuildOffline=true $(CommonProps);RuntimeFrameworkVersion=$(MicrosoftNETCoreApp21PackageVersion) $(CommonProps);AppMetapackageVersion=$(PackageVersion) + $(CommonProps);BuildNumber=$(BuildNumber) + + + + AspNetUniverseBuildOffline=true; + DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcesPropsPath); + DotNetPackageVersionPropsPath=$(GeneratedPackageVersionPropsPath); + BuildNumber=$(BuildNumber); + Configuration=$(Configuration); + IsFinalBuild=$(IsFinalBuild); + + + + + + + + + + + + + true diff --git a/build/artifacts.props b/build/artifacts.props index 05028ca8bb..cc9b15aab9 100644 --- a/build/artifacts.props +++ b/build/artifacts.props @@ -43,6 +43,7 @@ + diff --git a/build/repo.props b/build/repo.props index d7bebe44d4..e595d67e62 100644 --- a/build/repo.props +++ b/build/repo.props @@ -14,6 +14,9 @@ $(RepositoryRoot).deps\build\ $(RepositoryRoot).deps\Signed\Packages\ $(RepositoryRoot)src\Shared\ + $(SharedFxRid.Substring($([MSBuild]::Add($(SharedFxRid.LastIndexOf('-')), 1)))) + false + false diff --git a/build/repo.targets b/build/repo.targets index 0a0393f6de..c0d6650e27 100644 --- a/build/repo.targets +++ b/build/repo.targets @@ -1,7 +1,6 @@ - @@ -19,7 +18,7 @@ $(CompileDependsOn);BuildProjects;PackSharedSources $(CompileDependsOn);PackProjects;BuildRepositories $(PackageDependsOn);PackProjects - $(PackageDependsOn);BuildMetapackages;CheckExpectedPackagesExist + $(PackageDependsOn);BuildMetapackages;BuildSiteExtension;CheckExpectedPackagesExist $(TestDependsOn);TestProjects $(TestDependsOn);_TestRepositories $(GetArtifactInfoDependsOn);GetProjectArtifactInfo @@ -69,7 +68,7 @@ - + MicrosoftNETCoreAppPackageVersion=$(MicrosoftNETCoreAppPackageVersion); diff --git a/src/SiteExtensions/LoggingBranch/Directory.Build.targets b/src/SiteExtensions/LoggingBranch/Directory.Build.targets new file mode 100644 index 0000000000..df33ae31f1 --- /dev/null +++ b/src/SiteExtensions/LoggingBranch/Directory.Build.targets @@ -0,0 +1,33 @@ + + + + + + + + + false + + false + + false + + true + + false + + false + false + + + + + + NuGetPackage + $(PackageId) + $(PackageVersion) + + + + + diff --git a/src/SiteExtensions/LoggingBranch/LoggingBranch.csproj b/src/SiteExtensions/LoggingBranch/LoggingBranch.csproj new file mode 100644 index 0000000000..0fae8e658a --- /dev/null +++ b/src/SiteExtensions/LoggingBranch/LoggingBranch.csproj @@ -0,0 +1,33 @@ + + + + $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion) + ASP.NET Core Extensions + This extension enables additional functionality for ASP.NET Core on Azure WebSites, such as enabling Azure logging. + net461 + false + aspnet;logging;aspnetcore;AzureSiteExtension;keyvault;configuration;dataprotection + content + Microsoft.AspNetCore.AzureAppServices.SiteExtension.$(TrimmedVersion) + $(PackageVersion) + $(MicrosoftNETCoreApp21PackageVersion) + net461 + false + AzureSiteExtension + true + false + false + false + content + true + + + + + + + + + + + diff --git a/src/SiteExtensions/Sdk/HostingStartup/HostingStartup.csproj b/src/SiteExtensions/Sdk/HostingStartup/HostingStartup.csproj new file mode 100644 index 0000000000..59cdf76e60 --- /dev/null +++ b/src/SiteExtensions/Sdk/HostingStartup/HostingStartup.csproj @@ -0,0 +1,13 @@ + + + + netcoreapp2.1 + Exe + + + + + + + + diff --git a/src/SiteExtensions/Sdk/HostingStartup/Program.cs b/src/SiteExtensions/Sdk/HostingStartup/Program.cs new file mode 100644 index 0000000000..8cd3c0026c --- /dev/null +++ b/src/SiteExtensions/Sdk/HostingStartup/Program.cs @@ -0,0 +1,7 @@ +// Copyright (c) .NET Foundation and contributors. All rights reserved. +// Licensed under the MIT license. See LICENSE file in the project root for full license information. + +public class Program +{ + public static void Main() { } +} \ No newline at end of file diff --git a/src/SiteExtensions/Sdk/SiteExtension.targets b/src/SiteExtensions/Sdk/SiteExtension.targets new file mode 100644 index 0000000000..6e941d74ac --- /dev/null +++ b/src/SiteExtensions/Sdk/SiteExtension.targets @@ -0,0 +1,86 @@ + + + + + + + <_TemplatesDirectory>$(MSBuildThisFileDirectory)..\content\ + <_DepsOutputDirectory>$(RepositoryRoot).w\se\ + <_WorkingDirectory>$(_DepsOutputDirectory)\depswork + <_BasePackagePath>content\additionaldeps\ + <_RuntimeStoreManifestFile>$(_DepsOutputDirectory)\rs.csproj + <_RuntimeStoreOutput>$(_DepsOutputDirectory)\rs\ + + + + + + + + + ]]> + + + + + <_TemplateFiles Include="$(MSBuildThisFileDirectory)\HostingStartup\*.cs*" /> + <_HostingStartupPackageReference + Include="%(HostingStartupPackageReference.Identity)" + Source="%(HostingStartupPackageReference.Source)" + Version="%(HostingStartupPackageReference.Version)" + WorkingDirectory="$(_DepsOutputDirectory)%(HostingStartupPackageReference.Identity)" + Project="$(_DepsOutputDirectory)%(HostingStartupPackageReference.Identity)\HostingStartup.csproj" + DepsFile="$(_DepsOutputDirectory)%(HostingStartupPackageReference.Identity)\p\HostingStartup.deps.json" + TrimmedDepsFile="$(_DepsOutputDirectory)%(HostingStartupPackageReference.Identity)\%(HostingStartupPackageReference.Identity).deps.json" + PackagePath="$(_BasePackagePath)%(HostingStartupPackageReference.Identity)\shared\Microsoft.AspNetCore.App\$(MicrosoftAspNetCoreAppPackageVersion)\" + /> + + + + + + + + <_CommonProperties> + AspNetUniverseBuildOffline=true; + DotNetRestoreSourcePropsPath=$(DotNetRestoreSourcePropsPath); + DotNetPackageVersionPropsPath=$(DotNetPackageVersionPropsPath); + BuildNumber=$(BuildNumber); + Configuration=$(Configuration); + IsFinalBuild=$(IsFinalBuild); + MicrosoftAspNetCoreAppPackageVersion=$(MicrosoftAspNetCoreAppPackageVersion); + RuntimeFrameworkVersion=$(HostingStartupRuntimeFrameworkVersion); + + + + + + + + + + + + + + + + <_RuntimeStoreFiles Include="$(_RuntimeStoreOutput)\%(HostingStartupRuntimeStoreTargets.Runtime)\**\*.dll" /> + + + + + + + + diff --git a/version.props b/version.props index 08bb4a8c92..17e25d5889 100644 --- a/version.props +++ b/version.props @@ -5,7 +5,7 @@ 7 servicing Servicing - t000 + t000 $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$(AspNetCorePatchVersion) 0.1.$(AspNetCorePatchVersion) From 5e825f4fd89f3acd76b125b6199669e7bd995aea Mon Sep 17 00:00:00 2001 From: Mikael Mengistu Date: Mon, 14 Jan 2019 12:21:45 -0800 Subject: [PATCH 09/15] Update the package baseline (#6614) --- build/dependencies.props | 14 +++++++------- eng/Baseline.Designer.props | 26 +++++++++++++------------- eng/Baseline.xml | 8 ++++---- version.props | 2 +- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index be764b8576..d6e1e63e78 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -2,13 +2,8 @@ - 2.1.6 - 2.1.6 - 4.5.3-servicing-27114-05 - 4.5.2-servicing-27114-05 - 4.5.2-servicing-27114-05 - 4.5.2 - 4.5.2-servicing-27114-05 + 2.1.7 + 2.1.7 @@ -205,6 +200,11 @@ 4.5.0 4.9.0 4.5.0 + 4.5.3 + 4.5.2 + 4.5.2 + 4.5.3 + 4.5.2 1.3.7 9.0.1 2.8.0 diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index 6aee6d0279..fca94be07c 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -2,7 +2,7 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.1.6 + 2.1.7 @@ -909,7 +909,7 @@ - 2.1.2 + 2.1.7 @@ -920,41 +920,41 @@ - - + + - 2.1.3 + 2.1.7 - + - + - + - + - + - + @@ -1145,12 +1145,12 @@ - 2.1.1 + 2.1.7 - + diff --git a/eng/Baseline.xml b/eng/Baseline.xml index bcbfb54292..adc7afcb87 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -4,7 +4,7 @@ This file contains a list of all the packages and their versions which were rele build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch. --> - + @@ -98,8 +98,8 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch. - - + + @@ -118,7 +118,7 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch. - + diff --git a/version.props b/version.props index 17e25d5889..94a3f4ccb9 100644 --- a/version.props +++ b/version.props @@ -2,7 +2,7 @@ 2 1 - 7 + 8 servicing Servicing t000 From 87af0c3f1f7f18e7f3d377a97344b8c69f6cb1f7 Mon Sep 17 00:00:00 2001 From: Chris Ross Date: Mon, 14 Jan 2019 12:28:25 -0800 Subject: [PATCH 10/15] Update Google Auth UserInfo endpoint (#6338) * Update Google Auth UserInfo endpoint #6069 * Add Google to PatchConfig --- eng/PatchConfig.props | 1 + .../Google/src/GoogleDefaults.cs | 20 +- .../Google/src/GoogleOptions.cs | 24 ++- .../Authentication/test/GoogleTests.cs | 188 ++---------------- src/Security/Security.sln | 14 +- 5 files changed, 56 insertions(+), 191 deletions(-) diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props index 5ce6494e43..0a6db36788 100644 --- a/eng/PatchConfig.props +++ b/eng/PatchConfig.props @@ -15,6 +15,7 @@ Later on, this will be checked using this condition: + Microsoft.AspNetCore.Authentication.Google; diff --git a/src/Security/Authentication/Google/src/GoogleDefaults.cs b/src/Security/Authentication/Google/src/GoogleDefaults.cs index 0428703180..2e6cf76e27 100644 --- a/src/Security/Authentication/Google/src/GoogleDefaults.cs +++ b/src/Security/Authentication/Google/src/GoogleDefaults.cs @@ -1,6 +1,8 @@ // 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; + namespace Microsoft.AspNetCore.Authentication.Google { /// @@ -16,6 +18,22 @@ namespace Microsoft.AspNetCore.Authentication.Google public static readonly string TokenEndpoint = "https://www.googleapis.com/oauth2/v4/token"; - public static readonly string UserInformationEndpoint = "https://www.googleapis.com/plus/v1/people/me"; + public static readonly string UserInformationEndpoint; + + private const string UseGooglePlusSwitch = "Switch.Microsoft.AspNetCore.Authentication.Google.UsePlus"; + + internal static readonly bool UseGooglePlus; + + static GoogleDefaults() + { + if (AppContext.TryGetSwitch(UseGooglePlusSwitch, out UseGooglePlus) && UseGooglePlus) + { + UserInformationEndpoint = "https://www.googleapis.com/plus/v1/people/me"; + } + else + { + UserInformationEndpoint = "https://www.googleapis.com/oauth2/v2/userinfo"; + } + } } } diff --git a/src/Security/Authentication/Google/src/GoogleOptions.cs b/src/Security/Authentication/Google/src/GoogleOptions.cs index 34028bc52b..03abaeaada 100644 --- a/src/Security/Authentication/Google/src/GoogleOptions.cs +++ b/src/Security/Authentication/Google/src/GoogleOptions.cs @@ -2,7 +2,6 @@ // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. using System.Security.Claims; -using Microsoft.AspNetCore.Authentication; using Microsoft.AspNetCore.Authentication.OAuth; using Microsoft.AspNetCore.Http; @@ -27,11 +26,22 @@ namespace Microsoft.AspNetCore.Authentication.Google Scope.Add("email"); ClaimActions.MapJsonKey(ClaimTypes.NameIdentifier, "id"); - ClaimActions.MapJsonKey(ClaimTypes.Name, "displayName"); - ClaimActions.MapJsonSubKey(ClaimTypes.GivenName, "name", "givenName"); - ClaimActions.MapJsonSubKey(ClaimTypes.Surname, "name", "familyName"); - ClaimActions.MapJsonKey("urn:google:profile", "url"); - ClaimActions.MapCustomJson(ClaimTypes.Email, GoogleHelper.GetEmail); + if (GoogleDefaults.UseGooglePlus) + { + ClaimActions.MapJsonKey(ClaimTypes.Name, "displayName"); + ClaimActions.MapJsonSubKey(ClaimTypes.GivenName, "name", "givenName"); + ClaimActions.MapJsonSubKey(ClaimTypes.Surname, "name", "familyName"); + ClaimActions.MapJsonKey("urn:google:profile", "url"); + ClaimActions.MapCustomJson(ClaimTypes.Email, GoogleHelper.GetEmail); + } + else + { + ClaimActions.MapJsonKey(ClaimTypes.Name, "name"); + ClaimActions.MapJsonKey(ClaimTypes.GivenName, "given_name"); + ClaimActions.MapJsonKey(ClaimTypes.Surname, "family_name"); + ClaimActions.MapJsonKey("urn:google:profile", "link"); + ClaimActions.MapJsonKey(ClaimTypes.Email, "email"); + } } /// @@ -39,4 +49,4 @@ namespace Microsoft.AspNetCore.Authentication.Google /// public string AccessType { get; set; } } -} \ No newline at end of file +} diff --git a/src/Security/Authentication/test/GoogleTests.cs b/src/Security/Authentication/test/GoogleTests.cs index 511a658ff4..cba74a4bd9 100644 --- a/src/Security/Authentication/test/GoogleTests.cs +++ b/src/Security/Authentication/test/GoogleTests.cs @@ -809,45 +809,7 @@ namespace Microsoft.AspNetCore.Authentication.Google { o.ClaimsIssuer = claimsIssuer; } - o.BackchannelHttpHandler = new TestHttpMessageHandler - { - Sender = req => - { - if (req.RequestUri.AbsoluteUri == "https://www.googleapis.com/oauth2/v4/token") - { - return ReturnJsonResponse(new - { - access_token = "Test Access Token", - expires_in = 3600, - token_type = "Bearer" - }); - } - else if (req.RequestUri.GetComponents(UriComponents.SchemeAndServer | UriComponents.Path, UriFormat.UriEscaped) == "https://www.googleapis.com/plus/v1/people/me") - { - return ReturnJsonResponse(new - { - id = "Test User ID", - displayName = "Test Name", - name = new - { - familyName = "Test Family Name", - givenName = "Test Given Name" - }, - url = "Profile link", - emails = new[] - { - new - { - value = "Test email", - type = "account" - } - } - }); - } - - throw new NotImplementedException(req.RequestUri.AbsoluteUri); - } - }; + o.BackchannelHttpHandler = CreateBackchannel(); }); var properties = new AuthenticationProperties(); @@ -999,46 +961,7 @@ namespace Microsoft.AspNetCore.Authentication.Google o.ClientId = "Test Id"; o.ClientSecret = "Test Secret"; o.StateDataFormat = stateFormat; - o.BackchannelHttpHandler = new TestHttpMessageHandler - { - Sender = req => - { - if (req.RequestUri.AbsoluteUri == "https://www.googleapis.com/oauth2/v4/token") - { - return ReturnJsonResponse(new - { - access_token = "Test Access Token", - expires_in = 3600, - token_type = "Bearer", - refresh_token = "Test Refresh Token" - }); - } - else if (req.RequestUri.GetComponents(UriComponents.SchemeAndServer | UriComponents.Path, UriFormat.UriEscaped) == "https://www.googleapis.com/plus/v1/people/me") - { - return ReturnJsonResponse(new - { - id = "Test User ID", - displayName = "Test Name", - name = new - { - familyName = "Test Family Name", - givenName = "Test Given Name" - }, - url = "Profile link", - emails = new[] - { - new - { - value = "Test email", - type = "account" - } - } - }); - } - - throw new NotImplementedException(req.RequestUri.AbsoluteUri); - } - }; + o.BackchannelHttpHandler = CreateBackchannel(); o.Events = new OAuthEvents { OnCreatingTicket = context => @@ -1079,46 +1002,7 @@ namespace Microsoft.AspNetCore.Authentication.Google o.ClientId = "Test Id"; o.ClientSecret = "Test Secret"; o.StateDataFormat = stateFormat; - o.BackchannelHttpHandler = new TestHttpMessageHandler - { - Sender = req => - { - if (req.RequestUri.AbsoluteUri == "https://www.googleapis.com/oauth2/v4/token") - { - return ReturnJsonResponse(new - { - access_token = "Test Access Token", - expires_in = 3600, - token_type = "Bearer", - refresh_token = "Test Refresh Token" - }); - } - else if (req.RequestUri.GetComponents(UriComponents.SchemeAndServer | UriComponents.Path, UriFormat.UriEscaped) == "https://www.googleapis.com/plus/v1/people/me") - { - return ReturnJsonResponse(new - { - id = "Test User ID", - displayName = "Test Name", - name = new - { - familyName = "Test Family Name", - givenName = "Test Given Name" - }, - url = "Profile link", - emails = new[] - { - new - { - value = "Test email", - type = "account" - } - } - }); - } - - throw new NotImplementedException(req.RequestUri.AbsoluteUri); - } - }; + o.BackchannelHttpHandler = CreateBackchannel(); o.Events = new OAuthEvents { OnTicketReceived = context => @@ -1169,46 +1053,7 @@ namespace Microsoft.AspNetCore.Authentication.Google return Task.FromResult(0); } }; - o.BackchannelHttpHandler = new TestHttpMessageHandler - { - Sender = req => - { - if (req.RequestUri.AbsoluteUri == "https://www.googleapis.com/oauth2/v4/token") - { - return ReturnJsonResponse(new - { - access_token = "Test Access Token", - expires_in = 3600, - token_type = "Bearer", - refresh_token = "Test Refresh Token" - }); - } - else if (req.RequestUri.GetComponents(UriComponents.SchemeAndServer | UriComponents.Path, UriFormat.UriEscaped) == "https://www.googleapis.com/plus/v1/people/me") - { - return ReturnJsonResponse(new - { - id = "Test User ID", - displayName = "Test Name", - name = new - { - familyName = "Test Family Name", - givenName = "Test Given Name" - }, - url = "Profile link", - emails = new[] - { - new - { - value = "Test email", - type = "account" - } - } - }); - } - - throw new NotImplementedException(req.RequestUri.AbsoluteUri); - } - }; + o.BackchannelHttpHandler = CreateBackchannel(); }); var properties = new AuthenticationProperties(); @@ -1439,29 +1284,20 @@ namespace Microsoft.AspNetCore.Authentication.Google { access_token = "Test Access Token", expires_in = 3600, - token_type = "Bearer" + token_type = "Bearer", + refresh_token = "Test Refresh Token" }); } - else if (req.RequestUri.GetComponents(UriComponents.SchemeAndServer | UriComponents.Path, UriFormat.UriEscaped) == "https://www.googleapis.com/plus/v1/people/me") + else if (req.RequestUri.GetComponents(UriComponents.SchemeAndServer | UriComponents.Path, UriFormat.UriEscaped) == "https://www.googleapis.com/oauth2/v2/userinfo") { return ReturnJsonResponse(new { id = "Test User ID", - displayName = "Test Name", - name = new - { - familyName = "Test Family Name", - givenName = "Test Given Name" - }, - url = "Profile link", - emails = new[] - { - new - { - value = "Test email", - type = "account" - } - } + name = "Test Name", + given_name = "Test Given Name", + family_name = "Test Family Name", + link = "Profile link", + email = "Test email", }); } diff --git a/src/Security/Security.sln b/src/Security/Security.sln index b8aa6968a4..3d36597db9 100644 --- a/src/Security/Security.sln +++ b/src/Security/Security.sln @@ -96,12 +96,12 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Diagno EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.StaticFiles", "..\Middleware\StaticFiles\src\Microsoft.AspNetCore.StaticFiles.csproj", "{6FFBD7CD-2B7D-4EC9-8D18-54E53F852B04}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration", "..\Servers\IIS\IISIntegration\src\Microsoft.AspNetCore.Server.IISIntegration.csproj", "{43AF597A-FCB8-41A5-8279-345FEE9A61AD}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel", "..\Servers\Kestrel\Kestrel\src\Microsoft.AspNetCore.Server.Kestrel.csproj", "{707CBFB4-4D35-479E-9BAF-39B4DA9782DE}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.Kestrel.Https", "..\Servers\Kestrel\Https\src\Microsoft.AspNetCore.Server.Kestrel.Https.csproj", "{AFE880E8-2E9E-46FD-BE87-DFC8192E7B2D}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration", "..\Servers\IIS\IISIntegration\src\Microsoft.AspNetCore.Server.IISIntegration.csproj", "{81D0E81F-4711-4C7B-BBD4-E168102D0D7D}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -236,10 +236,6 @@ Global {6FFBD7CD-2B7D-4EC9-8D18-54E53F852B04}.Debug|Any CPU.Build.0 = Debug|Any CPU {6FFBD7CD-2B7D-4EC9-8D18-54E53F852B04}.Release|Any CPU.ActiveCfg = Release|Any CPU {6FFBD7CD-2B7D-4EC9-8D18-54E53F852B04}.Release|Any CPU.Build.0 = Release|Any CPU - {43AF597A-FCB8-41A5-8279-345FEE9A61AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {43AF597A-FCB8-41A5-8279-345FEE9A61AD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {43AF597A-FCB8-41A5-8279-345FEE9A61AD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {43AF597A-FCB8-41A5-8279-345FEE9A61AD}.Release|Any CPU.Build.0 = Release|Any CPU {707CBFB4-4D35-479E-9BAF-39B4DA9782DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {707CBFB4-4D35-479E-9BAF-39B4DA9782DE}.Debug|Any CPU.Build.0 = Debug|Any CPU {707CBFB4-4D35-479E-9BAF-39B4DA9782DE}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -248,6 +244,10 @@ Global {AFE880E8-2E9E-46FD-BE87-DFC8192E7B2D}.Debug|Any CPU.Build.0 = Debug|Any CPU {AFE880E8-2E9E-46FD-BE87-DFC8192E7B2D}.Release|Any CPU.ActiveCfg = Release|Any CPU {AFE880E8-2E9E-46FD-BE87-DFC8192E7B2D}.Release|Any CPU.Build.0 = Release|Any CPU + {81D0E81F-4711-4C7B-BBD4-E168102D0D7D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {81D0E81F-4711-4C7B-BBD4-E168102D0D7D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {81D0E81F-4711-4C7B-BBD4-E168102D0D7D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {81D0E81F-4711-4C7B-BBD4-E168102D0D7D}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -295,9 +295,9 @@ Global {B6CA96E4-674A-4616-9A38-DED07BE458E1} = {A3766414-EB5C-40F7-B031-121804ED5D0A} {54CBBAED-36D5-4855-BB4E-D1AE3523AA23} = {A3766414-EB5C-40F7-B031-121804ED5D0A} {6FFBD7CD-2B7D-4EC9-8D18-54E53F852B04} = {A3766414-EB5C-40F7-B031-121804ED5D0A} - {43AF597A-FCB8-41A5-8279-345FEE9A61AD} = {A3766414-EB5C-40F7-B031-121804ED5D0A} {707CBFB4-4D35-479E-9BAF-39B4DA9782DE} = {A3766414-EB5C-40F7-B031-121804ED5D0A} {AFE880E8-2E9E-46FD-BE87-DFC8192E7B2D} = {A3766414-EB5C-40F7-B031-121804ED5D0A} + {81D0E81F-4711-4C7B-BBD4-E168102D0D7D} = {A3766414-EB5C-40F7-B031-121804ED5D0A} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {ABF8089E-43D0-4010-84A7-7A9DCFE49357} From c2aa2957f6ced2c9cdc751ed500573519d134a38 Mon Sep 17 00:00:00 2001 From: John Luo Date: Mon, 14 Jan 2019 13:26:58 -0800 Subject: [PATCH 11/15] Merge fixes --- eng/Baseline.Designer.props | 10 +- eng/ProjectReferences.props | 2 +- src/Mvc/Mvc.sln | 324 +++++++++++------- .../CoreCLRTests/SimpleAppTest_CoreCLR.cs | 2 +- .../Infrastructure/ApplicationTestFixture.cs | 2 +- ...zor.ViewCompilation.FunctionalTests.csproj | 7 +- .../ApplicationUsingRelativePaths.csproj | 16 - .../ApplicationWithConfigureMvc.csproj | 2 +- .../ApplicationWithCustomInputFiles.csproj | 2 +- .../ApplicationWithParseErrors.csproj | 2 +- .../ApplicationWithRazorSdkNeitherUsed.csproj | 2 +- ...ationWithRazorSdkPrecompilationUsed.csproj | 2 +- .../ApplicationWithRazorSdkUsed.csproj | 2 +- .../ApplicationWithTagHelpers.csproj | 2 +- .../testassets/Directory.Build.props | 3 - .../PublishWithEmbedViewSources.csproj | 2 +- .../RazorPagesApp/RazorPagesApp.csproj | 2 +- .../testassets/SimpleApp/SimpleApp.csproj | 2 +- .../SimpleAppWithAssemblyRename.csproj | 2 +- .../StrongNamedApp/StrongNamedApp.csproj | 2 +- 20 files changed, 216 insertions(+), 174 deletions(-) delete mode 100644 src/Mvc/ViewCompilation/testassets/ApplicationUsingRelativePaths/ApplicationUsingRelativePaths.csproj diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index 9f78f046f4..98b5c9206c 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -754,15 +754,15 @@ - 2.1.1 + 2.2.0 - - + + - - + + diff --git a/eng/ProjectReferences.props b/eng/ProjectReferences.props index ab7f8a1bc0..6b2246a7db 100644 --- a/eng/ProjectReferences.props +++ b/eng/ProjectReferences.props @@ -122,8 +122,8 @@ - + diff --git a/src/Mvc/Mvc.sln b/src/Mvc/Mvc.sln index baefc4c000..edccac004c 100644 --- a/src/Mvc/Mvc.sln +++ b/src/Mvc/Mvc.sln @@ -236,8 +236,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Ra EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test", "ViewCompilation\test\UnitTests\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test.csproj", "{4A300DA7-A19B-459D-96CA-C999B2CCABFD}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationUsingRelativePaths", "ViewCompilation\testassets\ApplicationUsingRelativePaths\ApplicationUsingRelativePaths.csproj", "{53663DBF-D7FF-4BBF-8211-909237616049}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationWithConfigureMvc", "ViewCompilation\testassets\ApplicationWithConfigureMvc\ApplicationWithConfigureMvc.csproj", "{134CDB3F-76CF-44D8-9621-F865092ACF20}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApplicationWithCustomInputFiles", "ViewCompilation\testassets\ApplicationWithCustomInputFiles\ApplicationWithCustomInputFiles.csproj", "{23F77F9B-2979-4DF0-9096-C090CE7BE09D}" @@ -266,6 +264,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StrongNamedApp", "ViewCompi EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.FunctionalTests", "ViewCompilation\test\FunctionalTests\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.FunctionalTests.csproj", "{0A2B5ED2-E9A7-41A5-9B0F-10007673F2D9}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Routing", "..\Http\Routing\src\Microsoft.AspNetCore.Routing.csproj", "{457D7B8F-C81D-4F0C-BE88-B0516374944E}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Routing.Abstractions", "..\Http\Routing.Abstractions\src\Microsoft.AspNetCore.Routing.Abstractions.csproj", "{69D6513F-66AD-44C6-BD3F-8DE78CB4398F}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Authentication.JwtBearer", "..\Security\Authentication\JwtBearer\src\Microsoft.AspNetCore.Authentication.JwtBearer.csproj", "{1348A3AB-8401-4DAE-90CC-A5907ED52A36}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Hosting.Server.Abstractions", "..\Hosting\Server.Abstractions\src\Microsoft.AspNetCore.Hosting.Server.Abstractions.csproj", "{1C4D389D-F3BB-4328-A730-E3CC2F5D8B1B}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Hosting.Abstractions", "..\Hosting\Abstractions\src\Microsoft.AspNetCore.Hosting.Abstractions.csproj", "{94A04746-8698-4DEF-BCFC-8BA2D3F8A451}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -954,6 +962,114 @@ Global {17122147-ADFD-41C8-87D9-CCC582CCA8F9}.Release|Mixed Platforms.Build.0 = Release|Any CPU {17122147-ADFD-41C8-87D9-CCC582CCA8F9}.Release|x86.ActiveCfg = Release|Any CPU {17122147-ADFD-41C8-87D9-CCC582CCA8F9}.Release|x86.Build.0 = Release|Any CPU + {51E3E785-A9D1-4196-BAFE-A17FF4304B89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {51E3E785-A9D1-4196-BAFE-A17FF4304B89}.Debug|Any CPU.Build.0 = Debug|Any CPU + {51E3E785-A9D1-4196-BAFE-A17FF4304B89}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {51E3E785-A9D1-4196-BAFE-A17FF4304B89}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {51E3E785-A9D1-4196-BAFE-A17FF4304B89}.Debug|x86.ActiveCfg = Debug|Any CPU + {51E3E785-A9D1-4196-BAFE-A17FF4304B89}.Debug|x86.Build.0 = Debug|Any CPU + {51E3E785-A9D1-4196-BAFE-A17FF4304B89}.Release|Any CPU.ActiveCfg = Release|Any CPU + {51E3E785-A9D1-4196-BAFE-A17FF4304B89}.Release|Any CPU.Build.0 = Release|Any CPU + {51E3E785-A9D1-4196-BAFE-A17FF4304B89}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {51E3E785-A9D1-4196-BAFE-A17FF4304B89}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {51E3E785-A9D1-4196-BAFE-A17FF4304B89}.Release|x86.ActiveCfg = Release|Any CPU + {51E3E785-A9D1-4196-BAFE-A17FF4304B89}.Release|x86.Build.0 = Release|Any CPU + {910F023A-88E3-4CB4-8793-AC4005C7B421}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {910F023A-88E3-4CB4-8793-AC4005C7B421}.Debug|Any CPU.Build.0 = Debug|Any CPU + {910F023A-88E3-4CB4-8793-AC4005C7B421}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {910F023A-88E3-4CB4-8793-AC4005C7B421}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {910F023A-88E3-4CB4-8793-AC4005C7B421}.Debug|x86.ActiveCfg = Debug|Any CPU + {910F023A-88E3-4CB4-8793-AC4005C7B421}.Debug|x86.Build.0 = Debug|Any CPU + {910F023A-88E3-4CB4-8793-AC4005C7B421}.Release|Any CPU.ActiveCfg = Release|Any CPU + {910F023A-88E3-4CB4-8793-AC4005C7B421}.Release|Any CPU.Build.0 = Release|Any CPU + {910F023A-88E3-4CB4-8793-AC4005C7B421}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {910F023A-88E3-4CB4-8793-AC4005C7B421}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {910F023A-88E3-4CB4-8793-AC4005C7B421}.Release|x86.ActiveCfg = Release|Any CPU + {910F023A-88E3-4CB4-8793-AC4005C7B421}.Release|x86.Build.0 = Release|Any CPU + {E89EB74D-C1CE-456F-B42D-CCF1575E0CFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E89EB74D-C1CE-456F-B42D-CCF1575E0CFB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E89EB74D-C1CE-456F-B42D-CCF1575E0CFB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {E89EB74D-C1CE-456F-B42D-CCF1575E0CFB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {E89EB74D-C1CE-456F-B42D-CCF1575E0CFB}.Debug|x86.ActiveCfg = Debug|Any CPU + {E89EB74D-C1CE-456F-B42D-CCF1575E0CFB}.Debug|x86.Build.0 = Debug|Any CPU + {E89EB74D-C1CE-456F-B42D-CCF1575E0CFB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E89EB74D-C1CE-456F-B42D-CCF1575E0CFB}.Release|Any CPU.Build.0 = Release|Any CPU + {E89EB74D-C1CE-456F-B42D-CCF1575E0CFB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {E89EB74D-C1CE-456F-B42D-CCF1575E0CFB}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {E89EB74D-C1CE-456F-B42D-CCF1575E0CFB}.Release|x86.ActiveCfg = Release|Any CPU + {E89EB74D-C1CE-456F-B42D-CCF1575E0CFB}.Release|x86.Build.0 = Release|Any CPU + {DD7B9F20-354C-4D9E-8C8A-8AE6E7595A87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DD7B9F20-354C-4D9E-8C8A-8AE6E7595A87}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DD7B9F20-354C-4D9E-8C8A-8AE6E7595A87}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {DD7B9F20-354C-4D9E-8C8A-8AE6E7595A87}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {DD7B9F20-354C-4D9E-8C8A-8AE6E7595A87}.Debug|x86.ActiveCfg = Debug|Any CPU + {DD7B9F20-354C-4D9E-8C8A-8AE6E7595A87}.Debug|x86.Build.0 = Debug|Any CPU + {DD7B9F20-354C-4D9E-8C8A-8AE6E7595A87}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DD7B9F20-354C-4D9E-8C8A-8AE6E7595A87}.Release|Any CPU.Build.0 = Release|Any CPU + {DD7B9F20-354C-4D9E-8C8A-8AE6E7595A87}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {DD7B9F20-354C-4D9E-8C8A-8AE6E7595A87}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {DD7B9F20-354C-4D9E-8C8A-8AE6E7595A87}.Release|x86.ActiveCfg = Release|Any CPU + {DD7B9F20-354C-4D9E-8C8A-8AE6E7595A87}.Release|x86.Build.0 = Release|Any CPU + {3B550487-10E4-4E6D-9CEF-B1B4CA1253DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3B550487-10E4-4E6D-9CEF-B1B4CA1253DA}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3B550487-10E4-4E6D-9CEF-B1B4CA1253DA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {3B550487-10E4-4E6D-9CEF-B1B4CA1253DA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {3B550487-10E4-4E6D-9CEF-B1B4CA1253DA}.Debug|x86.ActiveCfg = Debug|Any CPU + {3B550487-10E4-4E6D-9CEF-B1B4CA1253DA}.Debug|x86.Build.0 = Debug|Any CPU + {3B550487-10E4-4E6D-9CEF-B1B4CA1253DA}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3B550487-10E4-4E6D-9CEF-B1B4CA1253DA}.Release|Any CPU.Build.0 = Release|Any CPU + {3B550487-10E4-4E6D-9CEF-B1B4CA1253DA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {3B550487-10E4-4E6D-9CEF-B1B4CA1253DA}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {3B550487-10E4-4E6D-9CEF-B1B4CA1253DA}.Release|x86.ActiveCfg = Release|Any CPU + {3B550487-10E4-4E6D-9CEF-B1B4CA1253DA}.Release|x86.Build.0 = Release|Any CPU + {D7C6A696-F232-4288-BCCD-367407E4A934}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D7C6A696-F232-4288-BCCD-367407E4A934}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D7C6A696-F232-4288-BCCD-367407E4A934}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {D7C6A696-F232-4288-BCCD-367407E4A934}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {D7C6A696-F232-4288-BCCD-367407E4A934}.Debug|x86.ActiveCfg = Debug|Any CPU + {D7C6A696-F232-4288-BCCD-367407E4A934}.Debug|x86.Build.0 = Debug|Any CPU + {D7C6A696-F232-4288-BCCD-367407E4A934}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D7C6A696-F232-4288-BCCD-367407E4A934}.Release|Any CPU.Build.0 = Release|Any CPU + {D7C6A696-F232-4288-BCCD-367407E4A934}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {D7C6A696-F232-4288-BCCD-367407E4A934}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {D7C6A696-F232-4288-BCCD-367407E4A934}.Release|x86.ActiveCfg = Release|Any CPU + {D7C6A696-F232-4288-BCCD-367407E4A934}.Release|x86.Build.0 = Release|Any CPU + {4EDC489F-3EC5-4AE3-9841-A285F40F5FF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4EDC489F-3EC5-4AE3-9841-A285F40F5FF6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4EDC489F-3EC5-4AE3-9841-A285F40F5FF6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {4EDC489F-3EC5-4AE3-9841-A285F40F5FF6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {4EDC489F-3EC5-4AE3-9841-A285F40F5FF6}.Debug|x86.ActiveCfg = Debug|Any CPU + {4EDC489F-3EC5-4AE3-9841-A285F40F5FF6}.Debug|x86.Build.0 = Debug|Any CPU + {4EDC489F-3EC5-4AE3-9841-A285F40F5FF6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4EDC489F-3EC5-4AE3-9841-A285F40F5FF6}.Release|Any CPU.Build.0 = Release|Any CPU + {4EDC489F-3EC5-4AE3-9841-A285F40F5FF6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {4EDC489F-3EC5-4AE3-9841-A285F40F5FF6}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {4EDC489F-3EC5-4AE3-9841-A285F40F5FF6}.Release|x86.ActiveCfg = Release|Any CPU + {4EDC489F-3EC5-4AE3-9841-A285F40F5FF6}.Release|x86.Build.0 = Release|Any CPU + {2F683CF8-B055-46AE-BF83-9D1307F8D45F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2F683CF8-B055-46AE-BF83-9D1307F8D45F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2F683CF8-B055-46AE-BF83-9D1307F8D45F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {2F683CF8-B055-46AE-BF83-9D1307F8D45F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {2F683CF8-B055-46AE-BF83-9D1307F8D45F}.Debug|x86.ActiveCfg = Debug|Any CPU + {2F683CF8-B055-46AE-BF83-9D1307F8D45F}.Debug|x86.Build.0 = Debug|Any CPU + {2F683CF8-B055-46AE-BF83-9D1307F8D45F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2F683CF8-B055-46AE-BF83-9D1307F8D45F}.Release|Any CPU.Build.0 = Release|Any CPU + {2F683CF8-B055-46AE-BF83-9D1307F8D45F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {2F683CF8-B055-46AE-BF83-9D1307F8D45F}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {2F683CF8-B055-46AE-BF83-9D1307F8D45F}.Release|x86.ActiveCfg = Release|Any CPU + {2F683CF8-B055-46AE-BF83-9D1307F8D45F}.Release|x86.Build.0 = Release|Any CPU + {34E3C302-B767-40C8-B538-3EE2BD4000C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {34E3C302-B767-40C8-B538-3EE2BD4000C4}.Debug|Any CPU.Build.0 = Debug|Any CPU + {34E3C302-B767-40C8-B538-3EE2BD4000C4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {34E3C302-B767-40C8-B538-3EE2BD4000C4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {34E3C302-B767-40C8-B538-3EE2BD4000C4}.Debug|x86.ActiveCfg = Debug|Any CPU + {34E3C302-B767-40C8-B538-3EE2BD4000C4}.Debug|x86.Build.0 = Debug|Any CPU + {34E3C302-B767-40C8-B538-3EE2BD4000C4}.Release|Any CPU.ActiveCfg = Release|Any CPU + {34E3C302-B767-40C8-B538-3EE2BD4000C4}.Release|Any CPU.Build.0 = Release|Any CPU + {34E3C302-B767-40C8-B538-3EE2BD4000C4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {34E3C302-B767-40C8-B538-3EE2BD4000C4}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {34E3C302-B767-40C8-B538-3EE2BD4000C4}.Release|x86.ActiveCfg = Release|Any CPU + {34E3C302-B767-40C8-B538-3EE2BD4000C4}.Release|x86.Build.0 = Release|Any CPU {0930C2EA-FA36-4EDF-A571-215765D1F2C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0930C2EA-FA36-4EDF-A571-215765D1F2C7}.Debug|Any CPU.Build.0 = Debug|Any CPU {0930C2EA-FA36-4EDF-A571-215765D1F2C7}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU @@ -1230,18 +1346,6 @@ Global {4A300DA7-A19B-459D-96CA-C999B2CCABFD}.Release|Mixed Platforms.Build.0 = Release|Any CPU {4A300DA7-A19B-459D-96CA-C999B2CCABFD}.Release|x86.ActiveCfg = Release|Any CPU {4A300DA7-A19B-459D-96CA-C999B2CCABFD}.Release|x86.Build.0 = Release|Any CPU - {53663DBF-D7FF-4BBF-8211-909237616049}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {53663DBF-D7FF-4BBF-8211-909237616049}.Debug|Any CPU.Build.0 = Debug|Any CPU - {53663DBF-D7FF-4BBF-8211-909237616049}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {53663DBF-D7FF-4BBF-8211-909237616049}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {53663DBF-D7FF-4BBF-8211-909237616049}.Debug|x86.ActiveCfg = Debug|Any CPU - {53663DBF-D7FF-4BBF-8211-909237616049}.Debug|x86.Build.0 = Debug|Any CPU - {53663DBF-D7FF-4BBF-8211-909237616049}.Release|Any CPU.ActiveCfg = Release|Any CPU - {53663DBF-D7FF-4BBF-8211-909237616049}.Release|Any CPU.Build.0 = Release|Any CPU - {53663DBF-D7FF-4BBF-8211-909237616049}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {53663DBF-D7FF-4BBF-8211-909237616049}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {53663DBF-D7FF-4BBF-8211-909237616049}.Release|x86.ActiveCfg = Release|Any CPU - {53663DBF-D7FF-4BBF-8211-909237616049}.Release|x86.Build.0 = Release|Any CPU {134CDB3F-76CF-44D8-9621-F865092ACF20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {134CDB3F-76CF-44D8-9621-F865092ACF20}.Debug|Any CPU.Build.0 = Debug|Any CPU {134CDB3F-76CF-44D8-9621-F865092ACF20}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU @@ -1410,114 +1514,66 @@ Global {0A2B5ED2-E9A7-41A5-9B0F-10007673F2D9}.Release|Mixed Platforms.Build.0 = Release|Any CPU {0A2B5ED2-E9A7-41A5-9B0F-10007673F2D9}.Release|x86.ActiveCfg = Release|Any CPU {0A2B5ED2-E9A7-41A5-9B0F-10007673F2D9}.Release|x86.Build.0 = Release|Any CPU - {51E3E785-A9D1-4196-BAFE-A17FF4304B89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {51E3E785-A9D1-4196-BAFE-A17FF4304B89}.Debug|Any CPU.Build.0 = Debug|Any CPU - {51E3E785-A9D1-4196-BAFE-A17FF4304B89}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {51E3E785-A9D1-4196-BAFE-A17FF4304B89}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {51E3E785-A9D1-4196-BAFE-A17FF4304B89}.Debug|x86.ActiveCfg = Debug|Any CPU - {51E3E785-A9D1-4196-BAFE-A17FF4304B89}.Debug|x86.Build.0 = Debug|Any CPU - {51E3E785-A9D1-4196-BAFE-A17FF4304B89}.Release|Any CPU.ActiveCfg = Release|Any CPU - {51E3E785-A9D1-4196-BAFE-A17FF4304B89}.Release|Any CPU.Build.0 = Release|Any CPU - {51E3E785-A9D1-4196-BAFE-A17FF4304B89}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {51E3E785-A9D1-4196-BAFE-A17FF4304B89}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {51E3E785-A9D1-4196-BAFE-A17FF4304B89}.Release|x86.ActiveCfg = Release|Any CPU - {51E3E785-A9D1-4196-BAFE-A17FF4304B89}.Release|x86.Build.0 = Release|Any CPU - {910F023A-88E3-4CB4-8793-AC4005C7B421}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {910F023A-88E3-4CB4-8793-AC4005C7B421}.Debug|Any CPU.Build.0 = Debug|Any CPU - {910F023A-88E3-4CB4-8793-AC4005C7B421}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {910F023A-88E3-4CB4-8793-AC4005C7B421}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {910F023A-88E3-4CB4-8793-AC4005C7B421}.Debug|x86.ActiveCfg = Debug|Any CPU - {910F023A-88E3-4CB4-8793-AC4005C7B421}.Debug|x86.Build.0 = Debug|Any CPU - {910F023A-88E3-4CB4-8793-AC4005C7B421}.Release|Any CPU.ActiveCfg = Release|Any CPU - {910F023A-88E3-4CB4-8793-AC4005C7B421}.Release|Any CPU.Build.0 = Release|Any CPU - {910F023A-88E3-4CB4-8793-AC4005C7B421}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {910F023A-88E3-4CB4-8793-AC4005C7B421}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {910F023A-88E3-4CB4-8793-AC4005C7B421}.Release|x86.ActiveCfg = Release|Any CPU - {910F023A-88E3-4CB4-8793-AC4005C7B421}.Release|x86.Build.0 = Release|Any CPU - {E89EB74D-C1CE-456F-B42D-CCF1575E0CFB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E89EB74D-C1CE-456F-B42D-CCF1575E0CFB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E89EB74D-C1CE-456F-B42D-CCF1575E0CFB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {E89EB74D-C1CE-456F-B42D-CCF1575E0CFB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {E89EB74D-C1CE-456F-B42D-CCF1575E0CFB}.Debug|x86.ActiveCfg = Debug|Any CPU - {E89EB74D-C1CE-456F-B42D-CCF1575E0CFB}.Debug|x86.Build.0 = Debug|Any CPU - {E89EB74D-C1CE-456F-B42D-CCF1575E0CFB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E89EB74D-C1CE-456F-B42D-CCF1575E0CFB}.Release|Any CPU.Build.0 = Release|Any CPU - {E89EB74D-C1CE-456F-B42D-CCF1575E0CFB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {E89EB74D-C1CE-456F-B42D-CCF1575E0CFB}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {E89EB74D-C1CE-456F-B42D-CCF1575E0CFB}.Release|x86.ActiveCfg = Release|Any CPU - {E89EB74D-C1CE-456F-B42D-CCF1575E0CFB}.Release|x86.Build.0 = Release|Any CPU - {DD7B9F20-354C-4D9E-8C8A-8AE6E7595A87}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DD7B9F20-354C-4D9E-8C8A-8AE6E7595A87}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DD7B9F20-354C-4D9E-8C8A-8AE6E7595A87}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {DD7B9F20-354C-4D9E-8C8A-8AE6E7595A87}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {DD7B9F20-354C-4D9E-8C8A-8AE6E7595A87}.Debug|x86.ActiveCfg = Debug|Any CPU - {DD7B9F20-354C-4D9E-8C8A-8AE6E7595A87}.Debug|x86.Build.0 = Debug|Any CPU - {DD7B9F20-354C-4D9E-8C8A-8AE6E7595A87}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DD7B9F20-354C-4D9E-8C8A-8AE6E7595A87}.Release|Any CPU.Build.0 = Release|Any CPU - {DD7B9F20-354C-4D9E-8C8A-8AE6E7595A87}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {DD7B9F20-354C-4D9E-8C8A-8AE6E7595A87}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {DD7B9F20-354C-4D9E-8C8A-8AE6E7595A87}.Release|x86.ActiveCfg = Release|Any CPU - {DD7B9F20-354C-4D9E-8C8A-8AE6E7595A87}.Release|x86.Build.0 = Release|Any CPU - {3B550487-10E4-4E6D-9CEF-B1B4CA1253DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3B550487-10E4-4E6D-9CEF-B1B4CA1253DA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3B550487-10E4-4E6D-9CEF-B1B4CA1253DA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {3B550487-10E4-4E6D-9CEF-B1B4CA1253DA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {3B550487-10E4-4E6D-9CEF-B1B4CA1253DA}.Debug|x86.ActiveCfg = Debug|Any CPU - {3B550487-10E4-4E6D-9CEF-B1B4CA1253DA}.Debug|x86.Build.0 = Debug|Any CPU - {3B550487-10E4-4E6D-9CEF-B1B4CA1253DA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3B550487-10E4-4E6D-9CEF-B1B4CA1253DA}.Release|Any CPU.Build.0 = Release|Any CPU - {3B550487-10E4-4E6D-9CEF-B1B4CA1253DA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {3B550487-10E4-4E6D-9CEF-B1B4CA1253DA}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {3B550487-10E4-4E6D-9CEF-B1B4CA1253DA}.Release|x86.ActiveCfg = Release|Any CPU - {3B550487-10E4-4E6D-9CEF-B1B4CA1253DA}.Release|x86.Build.0 = Release|Any CPU - {D7C6A696-F232-4288-BCCD-367407E4A934}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D7C6A696-F232-4288-BCCD-367407E4A934}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D7C6A696-F232-4288-BCCD-367407E4A934}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {D7C6A696-F232-4288-BCCD-367407E4A934}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {D7C6A696-F232-4288-BCCD-367407E4A934}.Debug|x86.ActiveCfg = Debug|Any CPU - {D7C6A696-F232-4288-BCCD-367407E4A934}.Debug|x86.Build.0 = Debug|Any CPU - {D7C6A696-F232-4288-BCCD-367407E4A934}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D7C6A696-F232-4288-BCCD-367407E4A934}.Release|Any CPU.Build.0 = Release|Any CPU - {D7C6A696-F232-4288-BCCD-367407E4A934}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {D7C6A696-F232-4288-BCCD-367407E4A934}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {D7C6A696-F232-4288-BCCD-367407E4A934}.Release|x86.ActiveCfg = Release|Any CPU - {D7C6A696-F232-4288-BCCD-367407E4A934}.Release|x86.Build.0 = Release|Any CPU - {4EDC489F-3EC5-4AE3-9841-A285F40F5FF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4EDC489F-3EC5-4AE3-9841-A285F40F5FF6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4EDC489F-3EC5-4AE3-9841-A285F40F5FF6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {4EDC489F-3EC5-4AE3-9841-A285F40F5FF6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {4EDC489F-3EC5-4AE3-9841-A285F40F5FF6}.Debug|x86.ActiveCfg = Debug|Any CPU - {4EDC489F-3EC5-4AE3-9841-A285F40F5FF6}.Debug|x86.Build.0 = Debug|Any CPU - {4EDC489F-3EC5-4AE3-9841-A285F40F5FF6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4EDC489F-3EC5-4AE3-9841-A285F40F5FF6}.Release|Any CPU.Build.0 = Release|Any CPU - {4EDC489F-3EC5-4AE3-9841-A285F40F5FF6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {4EDC489F-3EC5-4AE3-9841-A285F40F5FF6}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {4EDC489F-3EC5-4AE3-9841-A285F40F5FF6}.Release|x86.ActiveCfg = Release|Any CPU - {4EDC489F-3EC5-4AE3-9841-A285F40F5FF6}.Release|x86.Build.0 = Release|Any CPU - {2F683CF8-B055-46AE-BF83-9D1307F8D45F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2F683CF8-B055-46AE-BF83-9D1307F8D45F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2F683CF8-B055-46AE-BF83-9D1307F8D45F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {2F683CF8-B055-46AE-BF83-9D1307F8D45F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {2F683CF8-B055-46AE-BF83-9D1307F8D45F}.Debug|x86.ActiveCfg = Debug|Any CPU - {2F683CF8-B055-46AE-BF83-9D1307F8D45F}.Debug|x86.Build.0 = Debug|Any CPU - {2F683CF8-B055-46AE-BF83-9D1307F8D45F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2F683CF8-B055-46AE-BF83-9D1307F8D45F}.Release|Any CPU.Build.0 = Release|Any CPU - {2F683CF8-B055-46AE-BF83-9D1307F8D45F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {2F683CF8-B055-46AE-BF83-9D1307F8D45F}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {2F683CF8-B055-46AE-BF83-9D1307F8D45F}.Release|x86.ActiveCfg = Release|Any CPU - {2F683CF8-B055-46AE-BF83-9D1307F8D45F}.Release|x86.Build.0 = Release|Any CPU - {34E3C302-B767-40C8-B538-3EE2BD4000C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {34E3C302-B767-40C8-B538-3EE2BD4000C4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {34E3C302-B767-40C8-B538-3EE2BD4000C4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {34E3C302-B767-40C8-B538-3EE2BD4000C4}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {34E3C302-B767-40C8-B538-3EE2BD4000C4}.Debug|x86.ActiveCfg = Debug|Any CPU - {34E3C302-B767-40C8-B538-3EE2BD4000C4}.Debug|x86.Build.0 = Debug|Any CPU - {34E3C302-B767-40C8-B538-3EE2BD4000C4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {34E3C302-B767-40C8-B538-3EE2BD4000C4}.Release|Any CPU.Build.0 = Release|Any CPU - {34E3C302-B767-40C8-B538-3EE2BD4000C4}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {34E3C302-B767-40C8-B538-3EE2BD4000C4}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {34E3C302-B767-40C8-B538-3EE2BD4000C4}.Release|x86.ActiveCfg = Release|Any CPU - {34E3C302-B767-40C8-B538-3EE2BD4000C4}.Release|x86.Build.0 = Release|Any CPU + {457D7B8F-C81D-4F0C-BE88-B0516374944E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {457D7B8F-C81D-4F0C-BE88-B0516374944E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {457D7B8F-C81D-4F0C-BE88-B0516374944E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {457D7B8F-C81D-4F0C-BE88-B0516374944E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {457D7B8F-C81D-4F0C-BE88-B0516374944E}.Debug|x86.ActiveCfg = Debug|Any CPU + {457D7B8F-C81D-4F0C-BE88-B0516374944E}.Debug|x86.Build.0 = Debug|Any CPU + {457D7B8F-C81D-4F0C-BE88-B0516374944E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {457D7B8F-C81D-4F0C-BE88-B0516374944E}.Release|Any CPU.Build.0 = Release|Any CPU + {457D7B8F-C81D-4F0C-BE88-B0516374944E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {457D7B8F-C81D-4F0C-BE88-B0516374944E}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {457D7B8F-C81D-4F0C-BE88-B0516374944E}.Release|x86.ActiveCfg = Release|Any CPU + {457D7B8F-C81D-4F0C-BE88-B0516374944E}.Release|x86.Build.0 = Release|Any CPU + {69D6513F-66AD-44C6-BD3F-8DE78CB4398F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {69D6513F-66AD-44C6-BD3F-8DE78CB4398F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {69D6513F-66AD-44C6-BD3F-8DE78CB4398F}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {69D6513F-66AD-44C6-BD3F-8DE78CB4398F}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {69D6513F-66AD-44C6-BD3F-8DE78CB4398F}.Debug|x86.ActiveCfg = Debug|Any CPU + {69D6513F-66AD-44C6-BD3F-8DE78CB4398F}.Debug|x86.Build.0 = Debug|Any CPU + {69D6513F-66AD-44C6-BD3F-8DE78CB4398F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {69D6513F-66AD-44C6-BD3F-8DE78CB4398F}.Release|Any CPU.Build.0 = Release|Any CPU + {69D6513F-66AD-44C6-BD3F-8DE78CB4398F}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {69D6513F-66AD-44C6-BD3F-8DE78CB4398F}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {69D6513F-66AD-44C6-BD3F-8DE78CB4398F}.Release|x86.ActiveCfg = Release|Any CPU + {69D6513F-66AD-44C6-BD3F-8DE78CB4398F}.Release|x86.Build.0 = Release|Any CPU + {1348A3AB-8401-4DAE-90CC-A5907ED52A36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1348A3AB-8401-4DAE-90CC-A5907ED52A36}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1348A3AB-8401-4DAE-90CC-A5907ED52A36}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {1348A3AB-8401-4DAE-90CC-A5907ED52A36}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {1348A3AB-8401-4DAE-90CC-A5907ED52A36}.Debug|x86.ActiveCfg = Debug|Any CPU + {1348A3AB-8401-4DAE-90CC-A5907ED52A36}.Debug|x86.Build.0 = Debug|Any CPU + {1348A3AB-8401-4DAE-90CC-A5907ED52A36}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1348A3AB-8401-4DAE-90CC-A5907ED52A36}.Release|Any CPU.Build.0 = Release|Any CPU + {1348A3AB-8401-4DAE-90CC-A5907ED52A36}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {1348A3AB-8401-4DAE-90CC-A5907ED52A36}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {1348A3AB-8401-4DAE-90CC-A5907ED52A36}.Release|x86.ActiveCfg = Release|Any CPU + {1348A3AB-8401-4DAE-90CC-A5907ED52A36}.Release|x86.Build.0 = Release|Any CPU + {1C4D389D-F3BB-4328-A730-E3CC2F5D8B1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1C4D389D-F3BB-4328-A730-E3CC2F5D8B1B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1C4D389D-F3BB-4328-A730-E3CC2F5D8B1B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {1C4D389D-F3BB-4328-A730-E3CC2F5D8B1B}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {1C4D389D-F3BB-4328-A730-E3CC2F5D8B1B}.Debug|x86.ActiveCfg = Debug|Any CPU + {1C4D389D-F3BB-4328-A730-E3CC2F5D8B1B}.Debug|x86.Build.0 = Debug|Any CPU + {1C4D389D-F3BB-4328-A730-E3CC2F5D8B1B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1C4D389D-F3BB-4328-A730-E3CC2F5D8B1B}.Release|Any CPU.Build.0 = Release|Any CPU + {1C4D389D-F3BB-4328-A730-E3CC2F5D8B1B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {1C4D389D-F3BB-4328-A730-E3CC2F5D8B1B}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {1C4D389D-F3BB-4328-A730-E3CC2F5D8B1B}.Release|x86.ActiveCfg = Release|Any CPU + {1C4D389D-F3BB-4328-A730-E3CC2F5D8B1B}.Release|x86.Build.0 = Release|Any CPU + {94A04746-8698-4DEF-BCFC-8BA2D3F8A451}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {94A04746-8698-4DEF-BCFC-8BA2D3F8A451}.Debug|Any CPU.Build.0 = Debug|Any CPU + {94A04746-8698-4DEF-BCFC-8BA2D3F8A451}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {94A04746-8698-4DEF-BCFC-8BA2D3F8A451}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {94A04746-8698-4DEF-BCFC-8BA2D3F8A451}.Debug|x86.ActiveCfg = Debug|Any CPU + {94A04746-8698-4DEF-BCFC-8BA2D3F8A451}.Debug|x86.Build.0 = Debug|Any CPU + {94A04746-8698-4DEF-BCFC-8BA2D3F8A451}.Release|Any CPU.ActiveCfg = Release|Any CPU + {94A04746-8698-4DEF-BCFC-8BA2D3F8A451}.Release|Any CPU.Build.0 = Release|Any CPU + {94A04746-8698-4DEF-BCFC-8BA2D3F8A451}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {94A04746-8698-4DEF-BCFC-8BA2D3F8A451}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {94A04746-8698-4DEF-BCFC-8BA2D3F8A451}.Release|x86.ActiveCfg = Release|Any CPU + {94A04746-8698-4DEF-BCFC-8BA2D3F8A451}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1584,6 +1640,15 @@ Global {87A3E227-C45E-4141-A59F-402908E651FD} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E} {E3E09D2F-1FCF-4396-9B09-5A62CA8CC831} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} {17122147-ADFD-41C8-87D9-CCC582CCA8F9} = {16703B76-C9F7-4C75-AE6C-53D92E308E3C} + {51E3E785-A9D1-4196-BAFE-A17FF4304B89} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} + {910F023A-88E3-4CB4-8793-AC4005C7B421} = {2859F266-673A-45A2-9E3C-7B39C6DDD38E} + {E89EB74D-C1CE-456F-B42D-CCF1575E0CFB} = {2859F266-673A-45A2-9E3C-7B39C6DDD38E} + {DD7B9F20-354C-4D9E-8C8A-8AE6E7595A87} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} + {3B550487-10E4-4E6D-9CEF-B1B4CA1253DA} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E} + {D7C6A696-F232-4288-BCCD-367407E4A934} = {2859F266-673A-45A2-9E3C-7B39C6DDD38E} + {4EDC489F-3EC5-4AE3-9841-A285F40F5FF6} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E} + {2F683CF8-B055-46AE-BF83-9D1307F8D45F} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E} + {34E3C302-B767-40C8-B538-3EE2BD4000C4} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E} {0930C2EA-FA36-4EDF-A571-215765D1F2C7} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4} {A273BAAB-DA92-401D-B781-ADA9E3B7717C} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4} {E07B7D3A-1D4D-4644-84C2-06FEDB64885B} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4} @@ -1608,7 +1673,6 @@ Global {99BB0544-6AA4-4787-B396-0AE77D022547} = {83D016A9-7233-43FC-94C1-0AF2619D136B} {0BB79FE3-F376-4352-97B3-382F7FFDDBE9} = {83D016A9-7233-43FC-94C1-0AF2619D136B} {4A300DA7-A19B-459D-96CA-C999B2CCABFD} = {83D016A9-7233-43FC-94C1-0AF2619D136B} - {53663DBF-D7FF-4BBF-8211-909237616049} = {5C8A337A-956B-4045-A680-4A61942D0866} {134CDB3F-76CF-44D8-9621-F865092ACF20} = {5C8A337A-956B-4045-A680-4A61942D0866} {23F77F9B-2979-4DF0-9096-C090CE7BE09D} = {5C8A337A-956B-4045-A680-4A61942D0866} {B079D8A1-6CC1-46D8-948A-523AA6836FF9} = {5C8A337A-956B-4045-A680-4A61942D0866} @@ -1623,15 +1687,11 @@ Global {D54A8DCC-801E-4407-A9CC-01E4C33A72EB} = {5C8A337A-956B-4045-A680-4A61942D0866} {13CB4F98-F361-4989-BBC2-0B0ECDAC68F3} = {5C8A337A-956B-4045-A680-4A61942D0866} {0A2B5ED2-E9A7-41A5-9B0F-10007673F2D9} = {83D016A9-7233-43FC-94C1-0AF2619D136B} - {51E3E785-A9D1-4196-BAFE-A17FF4304B89} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} - {910F023A-88E3-4CB4-8793-AC4005C7B421} = {2859F266-673A-45A2-9E3C-7B39C6DDD38E} - {E89EB74D-C1CE-456F-B42D-CCF1575E0CFB} = {2859F266-673A-45A2-9E3C-7B39C6DDD38E} - {DD7B9F20-354C-4D9E-8C8A-8AE6E7595A87} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} - {3B550487-10E4-4E6D-9CEF-B1B4CA1253DA} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E} - {D7C6A696-F232-4288-BCCD-367407E4A934} = {2859F266-673A-45A2-9E3C-7B39C6DDD38E} - {4EDC489F-3EC5-4AE3-9841-A285F40F5FF6} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E} - {2F683CF8-B055-46AE-BF83-9D1307F8D45F} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E} - {34E3C302-B767-40C8-B538-3EE2BD4000C4} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E} + {457D7B8F-C81D-4F0C-BE88-B0516374944E} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4} + {69D6513F-66AD-44C6-BD3F-8DE78CB4398F} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4} + {1348A3AB-8401-4DAE-90CC-A5907ED52A36} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4} + {1C4D389D-F3BB-4328-A730-E3CC2F5D8B1B} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4} + {94A04746-8698-4DEF-BCFC-8BA2D3F8A451} = {5FE3048A-E96B-44F8-A7C4-FC590D7E04B4} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {63D344F6-F86D-40E6-85B9-0AABBE338C4A} diff --git a/src/Mvc/ViewCompilation/test/FunctionalTests/CoreCLRTests/SimpleAppTest_CoreCLR.cs b/src/Mvc/ViewCompilation/test/FunctionalTests/CoreCLRTests/SimpleAppTest_CoreCLR.cs index 18e17b588e..59beab6522 100644 --- a/src/Mvc/ViewCompilation/test/FunctionalTests/CoreCLRTests/SimpleAppTest_CoreCLR.cs +++ b/src/Mvc/ViewCompilation/test/FunctionalTests/CoreCLRTests/SimpleAppTest_CoreCLR.cs @@ -21,7 +21,7 @@ namespace FunctionalTests public ApplicationTestFixture Fixture { get; } - [Fact] + [Fact(Skip = "Needs to be rewritten")] public async Task Precompilation_WorksForSimpleApps() { using (StartLog(out var loggerFactory)) diff --git a/src/Mvc/ViewCompilation/test/FunctionalTests/Infrastructure/ApplicationTestFixture.cs b/src/Mvc/ViewCompilation/test/FunctionalTests/Infrastructure/ApplicationTestFixture.cs index 698a598593..7cfa4c8e67 100644 --- a/src/Mvc/ViewCompilation/test/FunctionalTests/Infrastructure/ApplicationTestFixture.cs +++ b/src/Mvc/ViewCompilation/test/FunctionalTests/Infrastructure/ApplicationTestFixture.cs @@ -23,7 +23,7 @@ namespace FunctionalTests static ApplicationTestFixture() { - SolutionDirectory = TestPathUtilities.GetSolutionRootDirectory("RazorViewCompilation"); + SolutionDirectory = TestPathUtilities.GetSolutionRootDirectory("Mvc"); if (!SolutionDirectory.EndsWith(Path.DirectorySeparatorChar.ToString())) { SolutionDirectory += Path.DirectorySeparatorChar; diff --git a/src/Mvc/ViewCompilation/test/FunctionalTests/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.FunctionalTests.csproj b/src/Mvc/ViewCompilation/test/FunctionalTests/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.FunctionalTests.csproj index a907e6c3e5..64327c946d 100644 --- a/src/Mvc/ViewCompilation/test/FunctionalTests/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.FunctionalTests.csproj +++ b/src/Mvc/ViewCompilation/test/FunctionalTests/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.FunctionalTests.csproj @@ -1,20 +1,22 @@  - netcoreapp2.1;net461 + netcoreapp2.2;net461 $(DefineConstants);__remove_this_to__GENERATE_BASELINES $(DefineConstants);GENERATE_BASELINES false false false + + win7-x64 - + @@ -32,7 +34,6 @@ - diff --git a/src/Mvc/ViewCompilation/testassets/ApplicationUsingRelativePaths/ApplicationUsingRelativePaths.csproj b/src/Mvc/ViewCompilation/testassets/ApplicationUsingRelativePaths/ApplicationUsingRelativePaths.csproj deleted file mode 100644 index 3540ab1a64..0000000000 --- a/src/Mvc/ViewCompilation/testassets/ApplicationUsingRelativePaths/ApplicationUsingRelativePaths.csproj +++ /dev/null @@ -1,16 +0,0 @@ - - - - netcoreapp2.1;net461 - - true - - - - - - - - - - diff --git a/src/Mvc/ViewCompilation/testassets/ApplicationWithConfigureMvc/ApplicationWithConfigureMvc.csproj b/src/Mvc/ViewCompilation/testassets/ApplicationWithConfigureMvc/ApplicationWithConfigureMvc.csproj index e65a851293..b9efd3a023 100644 --- a/src/Mvc/ViewCompilation/testassets/ApplicationWithConfigureMvc/ApplicationWithConfigureMvc.csproj +++ b/src/Mvc/ViewCompilation/testassets/ApplicationWithConfigureMvc/ApplicationWithConfigureMvc.csproj @@ -1,7 +1,7 @@  - netcoreapp2.1;net461 + netcoreapp2.2;net461 $(DefineConstants);TEST123 true diff --git a/src/Mvc/ViewCompilation/testassets/ApplicationWithCustomInputFiles/ApplicationWithCustomInputFiles.csproj b/src/Mvc/ViewCompilation/testassets/ApplicationWithCustomInputFiles/ApplicationWithCustomInputFiles.csproj index b7783e1836..ae1c074589 100644 --- a/src/Mvc/ViewCompilation/testassets/ApplicationWithCustomInputFiles/ApplicationWithCustomInputFiles.csproj +++ b/src/Mvc/ViewCompilation/testassets/ApplicationWithCustomInputFiles/ApplicationWithCustomInputFiles.csproj @@ -1,7 +1,7 @@  - netcoreapp2.1;net461 + netcoreapp2.2;net461 true true diff --git a/src/Mvc/ViewCompilation/testassets/ApplicationWithParseErrors/ApplicationWithParseErrors.csproj b/src/Mvc/ViewCompilation/testassets/ApplicationWithParseErrors/ApplicationWithParseErrors.csproj index 3540ab1a64..6783dd4f20 100644 --- a/src/Mvc/ViewCompilation/testassets/ApplicationWithParseErrors/ApplicationWithParseErrors.csproj +++ b/src/Mvc/ViewCompilation/testassets/ApplicationWithParseErrors/ApplicationWithParseErrors.csproj @@ -1,7 +1,7 @@  - netcoreapp2.1;net461 + netcoreapp2.2;net461 true diff --git a/src/Mvc/ViewCompilation/testassets/ApplicationWithRazorSdkNeitherUsed/ApplicationWithRazorSdkNeitherUsed.csproj b/src/Mvc/ViewCompilation/testassets/ApplicationWithRazorSdkNeitherUsed/ApplicationWithRazorSdkNeitherUsed.csproj index bb2dbbdd1a..3e7041a552 100644 --- a/src/Mvc/ViewCompilation/testassets/ApplicationWithRazorSdkNeitherUsed/ApplicationWithRazorSdkNeitherUsed.csproj +++ b/src/Mvc/ViewCompilation/testassets/ApplicationWithRazorSdkNeitherUsed/ApplicationWithRazorSdkNeitherUsed.csproj @@ -1,7 +1,7 @@  - netcoreapp2.1;net461 + netcoreapp2.2;net461 - win7-x64 diff --git a/src/Mvc/ViewCompilation/testassets/PublishWithEmbedViewSources/PublishWithEmbedViewSources.csproj b/src/Mvc/ViewCompilation/testassets/PublishWithEmbedViewSources/PublishWithEmbedViewSources.csproj index b3c1d87bdd..ba6cf6d165 100644 --- a/src/Mvc/ViewCompilation/testassets/PublishWithEmbedViewSources/PublishWithEmbedViewSources.csproj +++ b/src/Mvc/ViewCompilation/testassets/PublishWithEmbedViewSources/PublishWithEmbedViewSources.csproj @@ -1,7 +1,7 @@  - netcoreapp2.1;net461 + netcoreapp2.2;net461 true true diff --git a/src/Mvc/ViewCompilation/testassets/RazorPagesApp/RazorPagesApp.csproj b/src/Mvc/ViewCompilation/testassets/RazorPagesApp/RazorPagesApp.csproj index 4ee2d4a9e2..2743cf3763 100644 --- a/src/Mvc/ViewCompilation/testassets/RazorPagesApp/RazorPagesApp.csproj +++ b/src/Mvc/ViewCompilation/testassets/RazorPagesApp/RazorPagesApp.csproj @@ -1,7 +1,7 @@  - netcoreapp2.1;net461 + netcoreapp2.2;net461 true diff --git a/src/Mvc/ViewCompilation/testassets/SimpleApp/SimpleApp.csproj b/src/Mvc/ViewCompilation/testassets/SimpleApp/SimpleApp.csproj index bb1e780913..517e876237 100644 --- a/src/Mvc/ViewCompilation/testassets/SimpleApp/SimpleApp.csproj +++ b/src/Mvc/ViewCompilation/testassets/SimpleApp/SimpleApp.csproj @@ -1,7 +1,7 @@  - netcoreapp2.1;net461 + netcoreapp2.2;net461 win7-x86;debian-x64 true diff --git a/src/Mvc/ViewCompilation/testassets/SimpleAppWithAssemblyRename/SimpleAppWithAssemblyRename.csproj b/src/Mvc/ViewCompilation/testassets/SimpleAppWithAssemblyRename/SimpleAppWithAssemblyRename.csproj index 146c7b1a80..9720379ff1 100644 --- a/src/Mvc/ViewCompilation/testassets/SimpleAppWithAssemblyRename/SimpleAppWithAssemblyRename.csproj +++ b/src/Mvc/ViewCompilation/testassets/SimpleAppWithAssemblyRename/SimpleAppWithAssemblyRename.csproj @@ -2,7 +2,7 @@ NewAssemblyName - netcoreapp2.1;net461 + netcoreapp2.2;net461 true diff --git a/src/Mvc/ViewCompilation/testassets/StrongNamedApp/StrongNamedApp.csproj b/src/Mvc/ViewCompilation/testassets/StrongNamedApp/StrongNamedApp.csproj index 083764e87f..fa8608831a 100644 --- a/src/Mvc/ViewCompilation/testassets/StrongNamedApp/StrongNamedApp.csproj +++ b/src/Mvc/ViewCompilation/testassets/StrongNamedApp/StrongNamedApp.csproj @@ -1,7 +1,7 @@  - netcoreapp2.1;net461 + netcoreapp2.2;net461 true true From 80b77948da1bf397f68ffd61dded41c0169053e1 Mon Sep 17 00:00:00 2001 From: AndriySvyryd Date: Mon, 14 Jan 2019 14:27:39 -0800 Subject: [PATCH 12/15] Updating submodule(s) EntityFrameworkCore => 1cdd769419dc1ef5ea7bff5247786bc2bb1524b4 --- modules/EntityFrameworkCore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore index 536335387b..1cdd769419 160000 --- a/modules/EntityFrameworkCore +++ b/modules/EntityFrameworkCore @@ -1 +1 @@ -Subproject commit 536335387bb56f17621c7e4b4a1139bbbdd8f555 +Subproject commit 1cdd769419dc1ef5ea7bff5247786bc2bb1524b4 From a9b737b793154f2f374eacfa5df124df1e03337c Mon Sep 17 00:00:00 2001 From: BrennanConroy Date: Mon, 14 Jan 2019 18:46:07 -0800 Subject: [PATCH 13/15] Fix broken definitions file (#6343) --- eng/PatchConfig.props | 1 + .../ts/signalr-protocol-msgpack/src/MessagePackHubProtocol.ts | 2 +- src/SignalR/clients/ts/signalr/src/IHubProtocol.ts | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props index 2636d7aaab..f8377e8ebf 100644 --- a/eng/PatchConfig.props +++ b/eng/PatchConfig.props @@ -27,6 +27,7 @@ Later on, this will be checked using this condition: + @aspnet/signalr; diff --git a/src/SignalR/clients/ts/signalr-protocol-msgpack/src/MessagePackHubProtocol.ts b/src/SignalR/clients/ts/signalr-protocol-msgpack/src/MessagePackHubProtocol.ts index 38564d14fb..7ddc48e2e4 100644 --- a/src/SignalR/clients/ts/signalr-protocol-msgpack/src/MessagePackHubProtocol.ts +++ b/src/SignalR/clients/ts/signalr-protocol-msgpack/src/MessagePackHubProtocol.ts @@ -27,7 +27,7 @@ export class MessagePackHubProtocol implements IHubProtocol { /** Creates an array of HubMessage objects from the specified serialized representation. * - * @param {ArrayBuffer | Buffer} input An ArrayBuffer containing the serialized representation. + * @param {ArrayBuffer | Buffer} input An ArrayBuffer or Buffer containing the serialized representation. * @param {ILogger} logger A logger that will be used to log messages that occur during parsing. */ public parseMessages(input: ArrayBuffer | Buffer, logger: ILogger): HubMessage[] { diff --git a/src/SignalR/clients/ts/signalr/src/IHubProtocol.ts b/src/SignalR/clients/ts/signalr/src/IHubProtocol.ts index e771e399e1..c3fbaa1ea7 100644 --- a/src/SignalR/clients/ts/signalr/src/IHubProtocol.ts +++ b/src/SignalR/clients/ts/signalr/src/IHubProtocol.ts @@ -150,10 +150,10 @@ export interface IHubProtocol { * * If {@link @aspnet/signalr.IHubProtocol.transferFormat} is 'Text', the `input` parameter must be a string, otherwise it must be an ArrayBuffer. * - * @param {string | ArrayBuffer} input A string, or ArrayBuffer containing the serialized representation. + * @param {string | ArrayBuffer | Buffer} input A string, ArrayBuffer, or Buffer containing the serialized representation. * @param {ILogger} logger A logger that will be used to log messages that occur during parsing. */ - parseMessages(input: string | ArrayBuffer, logger: ILogger): HubMessage[]; + parseMessages(input: string | ArrayBuffer | Buffer, logger: ILogger): HubMessage[]; /** Writes the specified {@link @aspnet/signalr.HubMessage} to a string or ArrayBuffer and returns it. * From 38c0d5a50c7751d7d94fcd4b54992dd731059b43 Mon Sep 17 00:00:00 2001 From: John Luo Date: Mon, 14 Jan 2019 20:31:36 -0800 Subject: [PATCH 14/15] Use object indirection in HttpContextAccessor (#1066) (#6036) --- eng/PatchConfig.props | 1 + src/Http/Http/src/HttpContextAccessor.cs | 26 ++++++++++++++----- src/Http/Http/src/HttpContextFactory.cs | 4 --- .../Http/test/HttpContextAccessorTests.cs | 11 +------- src/Http/Http/test/HttpContextFactoryTests.cs | 2 -- 5 files changed, 22 insertions(+), 22 deletions(-) diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props index 229a1c4e2f..44b7a873f5 100644 --- a/eng/PatchConfig.props +++ b/eng/PatchConfig.props @@ -29,6 +29,7 @@ Later on, this will be checked using this condition: @aspnet/signalr; Microsoft.AspNetCore.Authentication.Google; + Microsoft.AspNetCore.Http; diff --git a/src/Http/Http/src/HttpContextAccessor.cs b/src/Http/Http/src/HttpContextAccessor.cs index 897c27f734..286151029c 100644 --- a/src/Http/Http/src/HttpContextAccessor.cs +++ b/src/Http/Http/src/HttpContextAccessor.cs @@ -7,21 +7,35 @@ namespace Microsoft.AspNetCore.Http { public class HttpContextAccessor : IHttpContextAccessor { - private static AsyncLocal<(string traceIdentifier, HttpContext context)> _httpContextCurrent = new AsyncLocal<(string traceIdentifier, HttpContext context)>(); + private static AsyncLocal _httpContextCurrent = new AsyncLocal(); public HttpContext HttpContext { get { - var value = _httpContextCurrent.Value; - // Only return the context if the stored request id matches the stored trace identifier - // context.TraceIdentifier is cleared by HttpContextFactory.Dispose. - return value.traceIdentifier == value.context?.TraceIdentifier ? value.context : null; + return _httpContextCurrent.Value?.Context; } set { - _httpContextCurrent.Value = (value?.TraceIdentifier, value); + var holder = _httpContextCurrent.Value; + if (holder != null) + { + // Clear current HttpContext trapped in the AsyncLocals, as its done. + holder.Context = null; + } + + if (value != null) + { + // Use an object indirection to hold the HttpContext in the AsyncLocal, + // so it can be cleared in all ExecutionContexts when its cleared. + _httpContextCurrent.Value = new HttpContextHolder { Context = value }; + } } } + + private class HttpContextHolder + { + public HttpContext Context; + } } } diff --git a/src/Http/Http/src/HttpContextFactory.cs b/src/Http/Http/src/HttpContextFactory.cs index f293ef4782..8236a388a5 100644 --- a/src/Http/Http/src/HttpContextFactory.cs +++ b/src/Http/Http/src/HttpContextFactory.cs @@ -53,10 +53,6 @@ namespace Microsoft.AspNetCore.Http { _httpContextAccessor.HttpContext = null; } - - // Null out the TraceIdentifier here as a sign that this request is done, - // the HttpContextAccessor implementation relies on this to detect that the request is over - httpContext.TraceIdentifier = null; } } } \ No newline at end of file diff --git a/src/Http/Http/test/HttpContextAccessorTests.cs b/src/Http/Http/test/HttpContextAccessorTests.cs index c1521b1bc3..c224a66a7d 100644 --- a/src/Http/Http/test/HttpContextAccessorTests.cs +++ b/src/Http/Http/test/HttpContextAccessorTests.cs @@ -44,7 +44,6 @@ namespace Microsoft.AspNetCore.Http var accessor = new HttpContextAccessor(); var context = new DefaultHttpContext(); - context.TraceIdentifier = "1"; accessor.HttpContext = context; var checkAsyncFlowTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); @@ -76,7 +75,6 @@ namespace Microsoft.AspNetCore.Http // Null out the accessor accessor.HttpContext = null; - context.TraceIdentifier = null; waitForNullTcs.SetResult(null); @@ -86,12 +84,11 @@ namespace Microsoft.AspNetCore.Http } [Fact] - public async Task HttpContextAccessor_GettingHttpContextReturnsNullHttpContextIfDifferentTraceIdentifier() + public async Task HttpContextAccessor_GettingHttpContextReturnsNullHttpContextIfChanged() { var accessor = new HttpContextAccessor(); var context = new DefaultHttpContext(); - context.TraceIdentifier = "1"; accessor.HttpContext = context; var checkAsyncFlowTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); @@ -121,12 +118,8 @@ namespace Microsoft.AspNetCore.Http await checkAsyncFlowTcs.Task; - // Reset the trace identifier on the first request - context.TraceIdentifier = null; - // Set a new http context var context2 = new DefaultHttpContext(); - context2.TraceIdentifier = "2"; accessor.HttpContext = context2; waitForNullTcs.SetResult(null); @@ -142,7 +135,6 @@ namespace Microsoft.AspNetCore.Http var accessor = new HttpContextAccessor(); var context = new DefaultHttpContext(); - context.TraceIdentifier = "1"; accessor.HttpContext = context; var checkAsyncFlowTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); @@ -172,7 +164,6 @@ namespace Microsoft.AspNetCore.Http var accessor = new HttpContextAccessor(); var context = new DefaultHttpContext(); - context.TraceIdentifier = "1"; accessor.HttpContext = context; var checkAsyncFlowTcs = new TaskCompletionSource(TaskCreationOptions.RunContinuationsAsynchronously); diff --git a/src/Http/Http/test/HttpContextFactoryTests.cs b/src/Http/Http/test/HttpContextFactoryTests.cs index 80e421273a..56b996f5be 100644 --- a/src/Http/Http/test/HttpContextFactoryTests.cs +++ b/src/Http/Http/test/HttpContextFactoryTests.cs @@ -34,7 +34,6 @@ namespace Microsoft.AspNetCore.Http // Act var context = contextFactory.Create(new FeatureCollection()); - var traceIdentifier = context.TraceIdentifier; // Assert Assert.Same(context, accessor.HttpContext); @@ -42,7 +41,6 @@ namespace Microsoft.AspNetCore.Http contextFactory.Dispose(context); Assert.Null(accessor.HttpContext); - Assert.NotEqual(traceIdentifier, context.TraceIdentifier); } [Fact] From e1c4d150f5dd747ae1bb2a650013d46aca4f6439 Mon Sep 17 00:00:00 2001 From: John Luo Date: Tue, 15 Jan 2019 18:59:13 -0800 Subject: [PATCH 15/15] Merge fix --- build/AzureIntegration.targets | 31 +++++++++++++++++++ build/SharedFx.targets | 22 ------------- build/artifacts.props | 1 - build/repo.props | 3 -- build/repo.targets | 5 +-- src/Security/Security.sln | 3 +- .../LoggingBranch/LoggingBranch.csproj | 17 ++++++++-- src/SiteExtensions/Sdk/SiteExtension.targets | 29 +++++++---------- 8 files changed, 61 insertions(+), 50 deletions(-) create mode 100644 build/AzureIntegration.targets diff --git a/build/AzureIntegration.targets b/build/AzureIntegration.targets new file mode 100644 index 0000000000..3d8a7af504 --- /dev/null +++ b/build/AzureIntegration.targets @@ -0,0 +1,31 @@ + + + $(MSBuildThisFileDirectory)..\src\AzureIntegration\ + + + + + + AspNetUniverseBuildOffline=true; + RepositoryRoot=$(AzureIntegrationProjectRoot); + DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcesPropsPath); + DotNetPackageVersionPropsPath=$(GeneratedPackageVersionPropsPath); + VersionSuffix=$(VersionSuffix); + BuildNumberSuffix=$(BuildNumberSuffix); + Configuration=$(Configuration); + IsFinalBuild=$(IsFinalBuild); + + + + + + + + + + + + + \ No newline at end of file diff --git a/build/SharedFx.targets b/build/SharedFx.targets index e2abd7ae95..08f15d775f 100644 --- a/build/SharedFx.targets +++ b/build/SharedFx.targets @@ -44,28 +44,6 @@ - - - - AspNetUniverseBuildOffline=true; - DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcesPropsPath); - DotNetPackageVersionPropsPath=$(GeneratedPackageVersionPropsPath); - BuildNumber=$(BuildNumber); - Configuration=$(Configuration); - IsFinalBuild=$(IsFinalBuild); - - - - - - - - - - - - - diff --git a/build/artifacts.props b/build/artifacts.props index ce6a78fb1f..756194a28b 100644 --- a/build/artifacts.props +++ b/build/artifacts.props @@ -28,7 +28,6 @@ This can be done once #4246 is complete, and done in conjunction with converting - diff --git a/build/repo.props b/build/repo.props index 0c86805c1e..f50b7d4f03 100644 --- a/build/repo.props +++ b/build/repo.props @@ -25,9 +25,6 @@ true $(RepositoryRoot)src\Shared\ - $(SharedFxRid.Substring($([MSBuild]::Add($(SharedFxRid.LastIndexOf('-')), 1)))) - false - false diff --git a/build/repo.targets b/build/repo.targets index 717eaa988b..0e3872ef1b 100644 --- a/build/repo.targets +++ b/build/repo.targets @@ -1,5 +1,6 @@ + @@ -35,7 +36,7 @@ $(CompileDependsOn);PackProjects;BuildRepositories;BuildSharedFx $(PackageDependsOn);PackProjects - $(PackageDependsOn);BuildSiteExtension;RemoveSharedFrameworkOnlyRefsFromNuspec + $(PackageDependsOn);RemoveSharedFrameworkOnlyRefsFromNuspec $(TestDependsOn);Compile @@ -92,7 +93,7 @@ - + $(BuildProperties);MicrosoftNETCoreAppPackageVersion=$(MicrosoftNETCoreAppPackageVersion); diff --git a/src/Security/Security.sln b/src/Security/Security.sln index e0457ed5e0..b2735e5b23 100644 --- a/src/Security/Security.sln +++ b/src/Security/Security.sln @@ -131,12 +131,11 @@ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Diagnostics.Abstractions", "..\Middleware\Diagnostics.Abstractions\src\Microsoft.AspNetCore.Diagnostics.Abstractions.csproj", "{73BCF909-4999-4663-BAE1-36B7734212B7}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Routing", "..\Http\Routing\src\Microsoft.AspNetCore.Routing.csproj", "{5B2F3890-198E-4BE8-8464-10B4D97F976A}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Routing.Abstractions", "..\Http\Routing.Abstractions\src\Microsoft.AspNetCore.Routing.Abstractions.csproj", "{71961A8D-B26F-46AE-A475-D00425D875A0}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration", "..\Servers\IIS\IISIntegration\src\Microsoft.AspNetCore.Server.IISIntegration.csproj", "{FD3AB895-2AF6-447D-82CF-DB002B491D23}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Server.IISIntegration", "..\Servers\IIS\IISIntegration\src\Microsoft.AspNetCore.Server.IISIntegration.csproj", "{81D0E81F-4711-4C7B-BBD4-E168102D0D7D}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU diff --git a/src/SiteExtensions/LoggingBranch/LoggingBranch.csproj b/src/SiteExtensions/LoggingBranch/LoggingBranch.csproj index e5f92e9c54..f905ee1b1c 100644 --- a/src/SiteExtensions/LoggingBranch/LoggingBranch.csproj +++ b/src/SiteExtensions/LoggingBranch/LoggingBranch.csproj @@ -1,14 +1,14 @@  - $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion) + $(VersionPrefix.Substring(0, $(VersionPrefix.LastIndexOf('.')))) ASP.NET Core Extensions This extension enables additional functionality for ASP.NET Core on Azure WebSites, such as enabling Azure logging. net461 false aspnet;logging;aspnetcore;AzureSiteExtension;keyvault;configuration;dataprotection content - Microsoft.AspNetCore.AzureAppServices.SiteExtension.$(TrimmedVersion) + Microsoft.AspNetCore.AzureAppServices.SiteExtension.$(TrimmedVersion).$(SharedFxArchitecture) $(PackageVersion) $(MicrosoftNETCoreAppPackageVersion) @@ -20,7 +20,6 @@ false false content - true @@ -29,6 +28,18 @@ + + + Pack + false + true + + + + Pack + false + true + diff --git a/src/SiteExtensions/Sdk/SiteExtension.targets b/src/SiteExtensions/Sdk/SiteExtension.targets index 0b12d94221..c7627c3012 100644 --- a/src/SiteExtensions/Sdk/SiteExtension.targets +++ b/src/SiteExtensions/Sdk/SiteExtension.targets @@ -9,7 +9,7 @@ <_TemplatesDirectory>$(MSBuildThisFileDirectory)..\content\ - <_DepsOutputDirectory>$(RepositoryRoot).w\se\ + <_DepsOutputDirectory>$(IntermediateOutputPath)\se\ <_WorkingDirectory>$(_DepsOutputDirectory)\depswork <_BasePackagePath>content\additionaldeps\ <_RuntimeStoreManifestFile>$(_DepsOutputDirectory)\rs.csproj @@ -17,6 +17,9 @@ + + netcoreapp3.0 + @@ -27,6 +30,11 @@ + + + + + <_TemplateFiles Include="$(MSBuildThisFileDirectory)\HostingStartup\*.cs*" /> <_HostingStartupPackageReference @@ -45,22 +53,9 @@ - - <_CommonProperties> - AspNetUniverseBuildOffline=true; - DotNetRestoreSourcePropsPath=$(DotNetRestoreSourcePropsPath); - DotNetPackageVersionPropsPath=$(DotNetPackageVersionPropsPath); - BuildNumber=$(BuildNumber); - Configuration=$(Configuration); - IsFinalBuild=$(IsFinalBuild); - MicrosoftAspNetCoreAppPackageVersion=$(MicrosoftAspNetCoreAppPackageVersion); - RuntimeFrameworkVersion=$(HostingStartupRuntimeFrameworkVersion); - - - + Properties="TargetFramework=%(HostingStartupRuntimeStoreTargets.Identity);RuntimeFrameworkVersion=$(HostingStartupRuntimeFrameworkVersion);RuntimeIdentifier=%(HostingStartupRuntimeStoreTargets.Runtime);ComposeDir=$(_RuntimeStoreOutput)\%(HostingStartupRuntimeStoreTargets.Runtime);SkipOptimization=true" /> @@ -68,11 +63,11 @@ + Properties="HostingStartupPackageName=%(_HostingStartupPackageReference.Identity);HostingStartupPackageVersion=%(_HostingStartupPackageReference.Version);RuntimeFrameworkVersion=$(HostingStartupRuntimeFrameworkVersion);MicrosoftAspNetCoreAppPackageVersion=$(MicrosoftAspNetCoreAppPackageVersion);UseAppHost=false;NoBuild=false" /> + Properties="PublishDir=%(_HostingStartupPackageReference.WorkingDirectory)\p;HostingStartupPackageName=%(_HostingStartupPackageReference.Identity);HostingStartupPackageVersion=%(_HostingStartupPackageReference.Version);RuntimeFrameworkVersion=$(HostingStartupRuntimeFrameworkVersion);MicrosoftAspNetCoreAppPackageVersion=$(MicrosoftAspNetCoreAppPackageVersion);UseAppHost=false;NoBuild=false;IncludeMainProjectInDepsFile=false" />