From 72104caff5a3015e62178fcc3ad9cd8a6b25ce28 Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Mon, 16 Apr 2018 17:00:46 -0700 Subject: [PATCH 01/42] Update version number to 2.2.0 --- version.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/version.props b/version.props index 24f2b00a0a..44985cedb3 100644 --- a/version.props +++ b/version.props @@ -1,7 +1,7 @@ - 2.1.0 - preview3 + 2.2.0 + preview1 $(VersionPrefix) $(VersionPrefix)-$(VersionSuffix)-final t000 From befde0fe711ce0a96150db39868070fef20dab3d Mon Sep 17 00:00:00 2001 From: Pranav K Date: Mon, 16 Apr 2018 17:55:47 -0700 Subject: [PATCH 02/42] Use the Razor.Sdk package Fixes #263 --- build/dependencies.props | 1 + .../ApplicationWithRazorSdkNeitherUsed.csproj | 1 + .../ApplicationWithRazorSdkPrecompilationUsed.csproj | 1 + .../ApplicationWithRazorSdkUsed.csproj | 1 + 4 files changed, 4 insertions(+) diff --git a/build/dependencies.props b/build/dependencies.props index cc2dfb4046..ba6bcba909 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -21,6 +21,7 @@ 2.1.0-preview3-32233 2.0.0 2.1.0-preview3-26413-05 + 2.1.0-preview3-32233 15.6.1 2.3.1 2.4.0-beta.1.build3945 diff --git a/testapps/ApplicationWithRazorSdkNeitherUsed/ApplicationWithRazorSdkNeitherUsed.csproj b/testapps/ApplicationWithRazorSdkNeitherUsed/ApplicationWithRazorSdkNeitherUsed.csproj index b7501d5fa6..97c4916e21 100644 --- a/testapps/ApplicationWithRazorSdkNeitherUsed/ApplicationWithRazorSdkNeitherUsed.csproj +++ b/testapps/ApplicationWithRazorSdkNeitherUsed/ApplicationWithRazorSdkNeitherUsed.csproj @@ -14,6 +14,7 @@ + diff --git a/testapps/ApplicationWithRazorSdkPrecompilationUsed/ApplicationWithRazorSdkPrecompilationUsed.csproj b/testapps/ApplicationWithRazorSdkPrecompilationUsed/ApplicationWithRazorSdkPrecompilationUsed.csproj index 3e106326fa..653d7c7a94 100644 --- a/testapps/ApplicationWithRazorSdkPrecompilationUsed/ApplicationWithRazorSdkPrecompilationUsed.csproj +++ b/testapps/ApplicationWithRazorSdkPrecompilationUsed/ApplicationWithRazorSdkPrecompilationUsed.csproj @@ -14,6 +14,7 @@ + diff --git a/testapps/ApplicationWithRazorSdkUsed/ApplicationWithRazorSdkUsed.csproj b/testapps/ApplicationWithRazorSdkUsed/ApplicationWithRazorSdkUsed.csproj index faaac76d5b..abe44b964e 100644 --- a/testapps/ApplicationWithRazorSdkUsed/ApplicationWithRazorSdkUsed.csproj +++ b/testapps/ApplicationWithRazorSdkUsed/ApplicationWithRazorSdkUsed.csproj @@ -9,6 +9,7 @@ + From 14ae9e130ce810f2559d53b9f1138ab9ed82e88d Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Mon, 23 Apr 2018 12:20:33 -0700 Subject: [PATCH 03/42] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 36 ++++++++++++++++++------------------ korebuild-lock.txt | 4 ++-- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index a4042807c9..b680549e1b 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -1,27 +1,27 @@ - + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.1.0-rc1-15774 - 2.1.0-rc1-30613 - 2.1.0-rc1-30613 - 2.1.0-rc1-30613 - 2.1.0-rc1-30613 - 2.1.0-rc1-30613 - 2.1.0-rc1-30613 - 0.5.0-preview2-30613 - 2.1.0-rc1-30613 - 2.1.0-rc1-30613 + 2.2.0-preview1-17037 + 2.2.0-preview1-34029 + 2.2.0-preview1-34029 + 2.2.0-preview1-34029 + 2.2.0-preview1-34029 + 2.2.0-preview1-34029 + 2.2.0-preview1-34029 + 0.5.0-preview3-34029 + 2.2.0-preview1-34029 + 2.2.0-preview1-34029 15.6.82 - 2.1.0-rc1-30613 - 2.1.0-rc1-30613 - 2.1.0-rc1-30613 - 2.1.0-rc1-30613 - 2.1.0-rc1-30613 + 2.2.0-preview1-34029 + 2.2.0-preview1-34029 + 2.2.0-preview1-34029 + 2.2.0-preview1-34029 + 2.2.0-preview1-34029 2.0.0 - 2.1.0-rc1-26419-02 - 2.1.0-rc1-30613 + 2.1.0-preview3-26413-05 + 2.2.0-preview1-34029 15.6.1 2.0.1 2.3.1 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 2713be4840..f27a67b442 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-17035 -commithash:10f346b815c17cd0347aa4fab8b4e3e309adec70 +version:2.2.0-preview1-17037 +commithash:557055a86cbdc359c97d4fb1c2d23a3dc7ae731e From a112560f711aadccddde52b54ba88efb80f3e6f2 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 29 Apr 2018 12:27:18 -0700 Subject: [PATCH 04/42] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 36 ++++++++++++++++++------------------ korebuild-lock.txt | 4 ++-- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index b680549e1b..ad554fe697 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -3,27 +3,27 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.2.0-preview1-17037 - 2.2.0-preview1-34029 - 2.2.0-preview1-34029 - 2.2.0-preview1-34029 - 2.2.0-preview1-34029 - 2.2.0-preview1-34029 - 2.2.0-preview1-34029 - 0.5.0-preview3-34029 - 2.2.0-preview1-34029 - 2.2.0-preview1-34029 + 2.2.0-preview1-17042 + 2.2.0-preview1-34066 + 2.2.0-preview1-34066 + 2.2.0-preview1-34066 + 2.2.0-preview1-34066 + 2.2.0-preview1-34066 + 2.2.0-preview1-34066 + 0.5.0-preview3-34066 + 2.2.0-preview1-34066 + 2.2.0-preview1-34066 15.6.82 - 2.2.0-preview1-34029 - 2.2.0-preview1-34029 - 2.2.0-preview1-34029 - 2.2.0-preview1-34029 - 2.2.0-preview1-34029 + 2.2.0-preview1-34066 + 2.2.0-preview1-34066 + 2.2.0-preview1-34066 + 2.2.0-preview1-34066 + 2.2.0-preview1-34066 2.0.0 - 2.1.0-preview3-26413-05 - 2.2.0-preview1-34029 + 2.2.0-preview1-26424-04 + 2.2.0-preview1-34066 15.6.1 - 2.0.1 + 2.0.3 2.3.1 2.4.0-beta.1.build3945 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index f27a67b442..335e579e06 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-17037 -commithash:557055a86cbdc359c97d4fb1c2d23a3dc7ae731e +version:2.2.0-preview1-17042 +commithash:edf0705d014293c260de763543784330514db9a3 From 0945eb40c86c8102e56e342af9ba1c7b151b297c Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 6 May 2018 12:26:29 -0700 Subject: [PATCH 05/42] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 32 ++++++++++++++++---------------- korebuild-lock.txt | 4 ++-- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index ad554fe697..1a64c44c4d 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -3,25 +3,25 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.2.0-preview1-17042 - 2.2.0-preview1-34066 - 2.2.0-preview1-34066 - 2.2.0-preview1-34066 - 2.2.0-preview1-34066 - 2.2.0-preview1-34066 - 2.2.0-preview1-34066 - 0.5.0-preview3-34066 - 2.2.0-preview1-34066 - 2.2.0-preview1-34066 + 2.2.0-preview1-17047 + 2.2.0-preview1-34135 + 2.2.0-preview1-34135 + 2.2.0-preview1-34135 + 2.2.0-preview1-34135 + 2.2.0-preview1-34135 + 2.2.0-preview1-34135 + 0.6.0-preview1-34135 + 2.2.0-preview1-34135 + 2.2.0-preview1-34135 15.6.82 - 2.2.0-preview1-34066 - 2.2.0-preview1-34066 - 2.2.0-preview1-34066 - 2.2.0-preview1-34066 - 2.2.0-preview1-34066 + 2.2.0-preview1-34135 + 2.2.0-preview1-34135 + 2.2.0-preview1-34135 + 2.2.0-preview1-34135 + 2.2.0-preview1-34135 2.0.0 2.2.0-preview1-26424-04 - 2.2.0-preview1-34066 + 2.2.0-preview1-34135 15.6.1 2.0.3 2.3.1 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 335e579e06..a16d4b9ee4 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-17042 -commithash:edf0705d014293c260de763543784330514db9a3 +version:2.2.0-preview1-17047 +commithash:e1957b52ddc8b62bd39c5c400322fccb5364624c From b92de7d0515c2d8b8612d658653ab13b72c6df74 Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Mon, 7 May 2018 15:14:10 -0700 Subject: [PATCH 06/42] Upgrade to netcoreapp22 --- Directory.Build.targets | 5 ++- build/dependencies.props | 35 ++++++++++--------- build/repo.props | 3 +- korebuild-lock.txt | 4 +-- test/Directory.Build.props | 6 ++-- .../CoreCLRApplicationTestFixture.cs | 6 ++-- test/FunctionalTests/FunctionalTests.csproj | 4 +-- testapps/Directory.Build.props | 4 +-- 8 files changed, 35 insertions(+), 32 deletions(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index 53b3f6e1da..78626b773e 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -1,7 +1,10 @@ - + $(MicrosoftNETCoreApp20PackageVersion) $(MicrosoftNETCoreApp21PackageVersion) + $(MicrosoftNETCoreApp22PackageVersion) $(NETStandardLibrary20PackageVersion) + + 99.9 diff --git a/build/dependencies.props b/build/dependencies.props index 1a64c44c4d..7aad838491 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -1,27 +1,28 @@ - + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.2.0-preview1-17047 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 0.6.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 + 2.2.0-preview1-17048 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 + 0.6.0-preview1-34140 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 15.6.82 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 - 2.2.0-preview1-34135 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 + 2.2.0-preview1-34140 2.0.0 2.2.0-preview1-26424-04 - 2.2.0-preview1-34135 + 2.2.0-preview1-26502-01 + 2.2.0-preview1-34140 15.6.1 2.0.3 2.3.1 diff --git a/build/repo.props b/build/repo.props index 78b0ce5879..17a98ac7e7 100644 --- a/build/repo.props +++ b/build/repo.props @@ -1,4 +1,4 @@ - + @@ -10,5 +10,6 @@ + diff --git a/korebuild-lock.txt b/korebuild-lock.txt index a16d4b9ee4..2573a03995 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-17047 -commithash:e1957b52ddc8b62bd39c5c400322fccb5364624c +version:2.2.0-preview1-17048 +commithash:de14a0ee5fb48508ee8a29c14280a2928f8dabf8 diff --git a/test/Directory.Build.props b/test/Directory.Build.props index 7ec143f84d..bf1f6628de 100644 --- a/test/Directory.Build.props +++ b/test/Directory.Build.props @@ -1,10 +1,10 @@ - + - netcoreapp2.1 + netcoreapp2.2 $(DeveloperBuildTestTfms) - netcoreapp2.1;netcoreapp2.0 + $(StandardTestTfms);net461 diff --git a/test/FunctionalTests/CoreCLRTests/CoreCLRApplicationTestFixture.cs b/test/FunctionalTests/CoreCLRTests/CoreCLRApplicationTestFixture.cs index d429b08de1..8deadfcef7 100644 --- a/test/FunctionalTests/CoreCLRTests/CoreCLRApplicationTestFixture.cs +++ b/test/FunctionalTests/CoreCLRTests/CoreCLRApplicationTestFixture.cs @@ -8,10 +8,8 @@ namespace FunctionalTests public class CoreCLRApplicationTestFixture : ApplicationTestFixture { private const string TargetFramework = -#if NETCOREAPP2_0 - "netcoreapp2.0"; -#elif NETCOREAPP2_1 - "netcoreapp2.1"; +#if NETCOREAPP2_2 + "netcoreapp2.2"; #else #error Target frameworks need to be updated #endif diff --git a/test/FunctionalTests/FunctionalTests.csproj b/test/FunctionalTests/FunctionalTests.csproj index 93409efa46..c0f7d7b8b7 100644 --- a/test/FunctionalTests/FunctionalTests.csproj +++ b/test/FunctionalTests/FunctionalTests.csproj @@ -1,4 +1,4 @@ - + $(StandardTestTfms) @@ -14,7 +14,7 @@ - + diff --git a/testapps/Directory.Build.props b/testapps/Directory.Build.props index 4f2b2a52d6..4c4c409bf9 100644 --- a/testapps/Directory.Build.props +++ b/testapps/Directory.Build.props @@ -2,9 +2,9 @@ - netcoreapp2.1 + netcoreapp2.2 $(DeveloperBuildTestAppTfms) - netcoreapp2.1;netcoreapp2.0 + netcoreapp2.2;netcoreapp2.0 $(StandardTestAppTfms);net461 From 34917df44c5204480f6abba568f247c2ba522f09 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 13 May 2018 14:19:02 -0700 Subject: [PATCH 07/42] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 38 +++++++++++++++++++------------------- korebuild-lock.txt | 4 ++-- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 7aad838491..5209be22ff 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -1,28 +1,28 @@ - + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.2.0-preview1-17048 - 2.2.0-preview1-34140 - 2.2.0-preview1-34140 - 2.2.0-preview1-34140 - 2.2.0-preview1-34140 - 2.2.0-preview1-34140 - 2.2.0-preview1-34140 - 0.6.0-preview1-34140 - 2.2.0-preview1-34140 - 2.2.0-preview1-34140 + 2.2.0-preview1-17051 + 2.2.0-preview1-34184 + 2.2.0-preview1-34184 + 2.2.0-preview1-34184 + 2.2.0-preview1-34184 + 2.2.0-preview1-34184 + 2.2.0-preview1-34184 + 0.6.0-preview1-34184 + 2.2.0-preview1-34184 + 2.2.0-preview1-34184 15.6.82 - 2.2.0-preview1-34140 - 2.2.0-preview1-34140 - 2.2.0-preview1-34140 - 2.2.0-preview1-34140 - 2.2.0-preview1-34140 + 2.2.0-preview1-34184 + 2.2.0-preview1-34184 + 2.2.0-preview1-34184 + 2.2.0-preview1-34184 + 2.2.0-preview1-34184 2.0.0 - 2.2.0-preview1-26424-04 - 2.2.0-preview1-26502-01 - 2.2.0-preview1-34140 + 2.1.0-rc1 + 2.2.0-preview1-26509-06 + 2.2.0-preview1-34184 15.6.1 2.0.3 2.3.1 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 2573a03995..89629b454c 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-17048 -commithash:de14a0ee5fb48508ee8a29c14280a2928f8dabf8 +version:2.2.0-preview1-17051 +commithash:253c3a480063bc3abaa5cde42f6e27b58457ef9b From 751b71395f951dfc327b845fffd132411e667303 Mon Sep 17 00:00:00 2001 From: "Chris Ross (ASP.NET)" Date: Wed, 16 May 2018 10:23:54 -0700 Subject: [PATCH 08/42] React to IntigrationTesting changes --- build/dependencies.props | 30 +++++++++---------- .../Infrastructure/ApplicationTestFixture.cs | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 5209be22ff..fab10e4f25 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,25 +4,25 @@ 2.2.0-preview1-17051 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 0.6.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 + 2.2.0-preview1-34216 + 2.2.0-preview1-34216 + 2.2.0-preview1-34216 + 2.2.0-preview1-34216 + 2.2.0-preview1-34216 + 2.2.0-preview1-34216 + 0.6.0-a-preview1-inttesting-17031 + 2.2.0-preview1-34216 + 2.2.0-preview1-34216 15.6.82 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 - 2.2.0-preview1-34184 + 2.2.0-preview1-34216 + 2.2.0-preview1-34216 + 2.2.0-preview1-34216 + 2.2.0-preview1-34216 + 2.2.0-preview1-34216 2.0.0 2.1.0-rc1 2.2.0-preview1-26509-06 - 2.2.0-preview1-34184 + 2.2.0-preview1-34216 15.6.1 2.0.3 2.3.1 diff --git a/test/FunctionalTests/Infrastructure/ApplicationTestFixture.cs b/test/FunctionalTests/Infrastructure/ApplicationTestFixture.cs index 56e988e05f..4df83aeec5 100644 --- a/test/FunctionalTests/Infrastructure/ApplicationTestFixture.cs +++ b/test/FunctionalTests/Infrastructure/ApplicationTestFixture.cs @@ -15,7 +15,7 @@ namespace FunctionalTests private const string DotnetCLITelemetryOptOut = "DOTNET_CLI_TELEMETRY_OPTOUT"; private static readonly SemaphoreSlim _deploymentLock = new SemaphoreSlim(initialCount: 1); private Task _deploymentTask; - private IApplicationDeployer _deployer; + private ApplicationDeployer _deployer; protected ApplicationTestFixture(string applicationName, string applicationPath) { From ed4470d9aaae2639dfcfc47191bdf9fd83c058fc Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 20 May 2018 19:42:28 +0000 Subject: [PATCH 09/42] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 32 ++++++++++++++++---------------- korebuild-lock.txt | 4 ++-- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index fab10e4f25..1a63a6e079 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -3,26 +3,26 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.2.0-preview1-17051 - 2.2.0-preview1-34216 - 2.2.0-preview1-34216 - 2.2.0-preview1-34216 - 2.2.0-preview1-34216 - 2.2.0-preview1-34216 - 2.2.0-preview1-34216 - 0.6.0-a-preview1-inttesting-17031 - 2.2.0-preview1-34216 - 2.2.0-preview1-34216 + 2.2.0-preview1-17060 + 2.2.0-preview1-34255 + 2.2.0-preview1-34255 + 2.2.0-preview1-34255 + 2.2.0-preview1-34255 + 2.2.0-preview1-34255 + 2.2.0-preview1-34255 + 0.6.0-preview1-34255 + 2.2.0-preview1-34255 + 2.2.0-preview1-34255 15.6.82 - 2.2.0-preview1-34216 - 2.2.0-preview1-34216 - 2.2.0-preview1-34216 - 2.2.0-preview1-34216 - 2.2.0-preview1-34216 + 2.2.0-preview1-34255 + 2.2.0-preview1-34255 + 2.2.0-preview1-34255 + 2.2.0-preview1-34255 + 2.2.0-preview1-34255 2.0.0 2.1.0-rc1 2.2.0-preview1-26509-06 - 2.2.0-preview1-34216 + 2.2.0-preview1-34255 15.6.1 2.0.3 2.3.1 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 89629b454c..cf2fff7def 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-17051 -commithash:253c3a480063bc3abaa5cde42f6e27b58457ef9b +version:2.2.0-preview1-17060 +commithash:25b4b134d6f8f7b461928f0d495cfc695ccabb5b From 94e0ecca732e3eb9bbe9094d3db6c356e65d2f36 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Tue, 22 May 2018 11:03:06 -0700 Subject: [PATCH 10/42] Compiling a 2.1.0 project targeting desktop with a reference to the ViewCompilation package produces a warning about mismatch in architectures Fixes #270 --- ...spNetCore.Mvc.Razor.ViewCompilation.csproj | 31 +++++++++---------- ...spNetCore.Mvc.Razor.ViewCompilation.nuspec | 18 ++++++----- ...pNetCore.Mvc.Razor.ViewCompilation.targets | 27 +++++++++------- testapps/Directory.Build.targets | 12 +------ 4 files changed, 41 insertions(+), 47 deletions(-) diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.csproj b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.csproj index bf7f0b000d..bd197e8f1e 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.csproj +++ b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.csproj @@ -13,15 +13,6 @@ $(MSBuildProjectName).nuspec - - win7-x86;win7-x64 - x86 - $(AssemblyName)-$(PlatformTarget) - false - bin\$(Configuration)\net461\win7-$(PlatformTarget) - obj\$(Configuration)\net461\win7-$(PlatformTarget) - - @@ -31,22 +22,28 @@ - + + TargetFramework=$(TargetFramework); + Platform=x86; + BuildNumber=$(BuildNumber); + OutputPath=$(OutputPath); + TargetName=$(TargetName)-x86" /> - + true + + unknown + id=$(PackageId); version=$(PackageVersion); @@ -66,10 +63,10 @@ TaskBinary=$(TasksProjectDirectory)bin\$(Configuration)\netstandard2.0\$(AssemblyName).Tasks.dll; TaskSymbol=$(TasksProjectDirectory)bin\$(Configuration)\netstandard2.0\$(AssemblyName).Tasks.pdb; - OutputExeX86=$(OutputPath)net461\win7-x86\$(AssemblyName)-x86.exe; - OutputExeSymbolX86=$(OutputPath)net461\win7-x86\$(AssemblyName)-x86.pdb; - OutputExeX64=$(OutputPath)net461\win7-x64\$(AssemblyName)-x64.exe; - OutputExeSymbolX64=$(OutputPath)net461\win7-x64\$(AssemblyName)-x64.pdb; + OutputExeX86=$(OutputPath)net461\$(AssemblyName)-x86.exe; + OutputExeSymbolX86=$(OutputPath)net461\$(AssemblyName)-x86.pdb; + OutputExeAnyCPU=$(OutputPath)net461\$(AssemblyName).exe; + OutputExeSymbolAnyCPU=$(OutputPath)net461\$(AssemblyName).pdb; diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.nuspec b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.nuspec index b6c0bf4785..7504cbac3b 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.nuspec +++ b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.nuspec @@ -26,13 +26,17 @@ - - + + + + + + + + + + - - - - - \ No newline at end of file + diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.targets b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.targets index 35c2d5d47b..7ce2043073 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.targets +++ b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.targets @@ -51,7 +51,8 @@ dotnet - <_MvcViewCompilationBinaryPath Condition="'$(_MvcViewCompilationBinaryPath)'==''">$(MSBuildThisFileDirectory)$(MSBuildThisFileName).dll + <_MvcViewCompilationBinariesDir Condition="'$(_MvcViewCompilationBinariesDir)' == ''">$(MSBuildThisFileDirectory) + <_MvcViewCompilationBinaryPath>$(_MvcViewCompilationBinariesDir)netcoreapp2.0\$(MSBuildThisFileName).dll "$(MvcRazorRunCommand)" exec $(ExecArgs) --runtimeconfig "$(ProjectRuntimeConfigFilePath)" @@ -79,17 +80,19 @@ Targets="Build;MvcRazorPrecompile" /> + + + <_MvcViewCompilationBinariesDir Condition="'$(_MvcViewCompilationBinariesDir)' == ''">$(MSBuildThisFileDirectory) + + <_MvcViewCompilationBinaryPath Condition="'$(PlatformTarget)'=='x86'">$(_MvcViewCompilationBinariesDir)net461\$(MSBuildThisFileName)-x86.exe + <_MvcViewCompilationBinaryPath Condition="'$(PlatformTarget)'!='x86'">$(_MvcViewCompilationBinariesDir)net461\$(MSBuildThisFileName).exe + + + - - - <_MvcViewCompilationBinaryPath Condition="'$(PlatformTarget)'=='x86'">$(MSBuildThisFileDirectory)$(MSBuildThisFileName)-x86.exe - - - <_MvcViewCompilationBinaryPath Condition="'$(_MvcViewCompilationBinaryPath)'==''">$(MSBuildThisFileDirectory)$(MSBuildThisFileName)-x64.exe - + Condition="'$(MvcRazorCompileOnPublish)'=='true' AND '$(ResolvedRazorCompileToolset)'=='PrecompilationTool' AND '$(TargetFrameworkIdentifier)'=='.NETFramework'"> @@ -98,7 +101,7 @@ @@ -165,11 +168,11 @@ Name="_MvcRazorPrecompileOnPublish" DependsOnTargets="MvcRazorPrecompile" AfterTargets="PrepareForPublish" - Condition="'$(ResolvedRazorCompileToolset)'=='PrecompilationTool'and '$(MvcRazorCompileOnPublish)'=='true'" /> + Condition="'$(ResolvedRazorCompileToolset)'=='PrecompilationTool' and '$(MvcRazorCompileOnPublish)'=='true'" /> + Condition="'$(ResolvedRazorCompileToolset)'=='PrecompilationTool' and '$(MvcRazorCompileOnPublish)'=='true'"> <_MvcRazorOutputPdbFullPath>$([System.IO.Path]::ChangeExtension('$(_MvcRazorOutputFullPath)', '.pdb')) diff --git a/testapps/Directory.Build.targets b/testapps/Directory.Build.targets index 4b805513d6..350846ecee 100644 --- a/testapps/Directory.Build.targets +++ b/testapps/Directory.Build.targets @@ -2,22 +2,12 @@ - <_MvcViewCompilationAddDesktopReferences>false $(MvcRazorCompileOnPublish) $(Configuration) <_MvcViewCompilationTasksPath>$(MSBuildThisFileDirectory)..\src\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tasks\bin\$(SolutionConfiguration)\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tasks.dll + <_MvcViewCompilationBinariesDir>$(MSBuildThisFileDirectory)..\src\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation\bin\$(SolutionConfiguration)\ - - - - <_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 - - From 3962f56aefe258a8ad327400c005beff5d6d368e Mon Sep 17 00:00:00 2001 From: "Nate McMaster (automated)" Date: Fri, 25 May 2018 16:16:36 -0700 Subject: [PATCH 11/42] Update bootstrapper scripts (automated commit) [ci skip] --- run.ps1 | 25 +++++++++++++++++++------ run.sh | 33 +++++++++++++++++++++++++++++---- 2 files changed, 48 insertions(+), 10 deletions(-) diff --git a/run.ps1 b/run.ps1 index 27dcf848f8..3b27382468 100644 --- a/run.ps1 +++ b/run.ps1 @@ -26,12 +26,18 @@ The base url where build tools can be downloaded. Overrides the value from the c .PARAMETER Update Updates KoreBuild to the latest version even if a lock file is present. +.PARAMETER Reinstall +Re-installs KoreBuild + .PARAMETER ConfigFile The path to the configuration file that stores values. Defaults to korebuild.json. .PARAMETER ToolsSourceSuffix The Suffix to append to the end of the ToolsSource. Useful for query strings in blob stores. +.PARAMETER CI +Sets up CI specific settings and variables. + .PARAMETER Arguments Arguments to be passed to the command @@ -65,8 +71,10 @@ param( [string]$ToolsSource, [Alias('u')] [switch]$Update, - [string]$ConfigFile, + [switch]$Reinstall, [string]$ToolsSourceSuffix, + [string]$ConfigFile = $null, + [switch]$CI, [Parameter(ValueFromRemainingArguments = $true)] [string[]]$Arguments ) @@ -93,6 +101,10 @@ function Get-KoreBuild { $version = $version.TrimStart('version:').Trim() $korebuildPath = Join-Paths $DotNetHome ('buildtools', 'korebuild', $version) + if ($Reinstall -and (Test-Path $korebuildPath)) { + Remove-Item -Force -Recurse $korebuildPath + } + if (!(Test-Path $korebuildPath)) { Write-Host -ForegroundColor Magenta "Downloading KoreBuild $version" New-Item -ItemType Directory -Path $korebuildPath | Out-Null @@ -101,9 +113,9 @@ function Get-KoreBuild { try { $tmpfile = Join-Path ([IO.Path]::GetTempPath()) "KoreBuild-$([guid]::NewGuid()).zip" Get-RemoteFile $remotePath $tmpfile $ToolsSourceSuffix - if (Get-Command -Name 'Expand-Archive' -ErrorAction Ignore) { + if (Get-Command -Name 'Microsoft.PowerShell.Archive\Expand-Archive' -ErrorAction Ignore) { # Use built-in commands where possible as they are cross-plat compatible - Expand-Archive -Path $tmpfile -DestinationPath $korebuildPath + Microsoft.PowerShell.Archive\Expand-Archive -Path $tmpfile -DestinationPath $korebuildPath } else { # Fallback to old approach for old installations of PowerShell @@ -167,8 +179,9 @@ if (Test-Path $ConfigFile) { } } catch { - Write-Warning "$ConfigFile could not be read. Its settings will be ignored." - Write-Warning $Error[0] + Write-Host -ForegroundColor Red $Error[0] + Write-Error "$ConfigFile contains invalid JSON." + exit 1 } } @@ -188,7 +201,7 @@ $korebuildPath = Get-KoreBuild Import-Module -Force -Scope Local (Join-Path $korebuildPath 'KoreBuild.psd1') try { - Set-KoreBuildSettings -ToolsSource $ToolsSource -DotNetHome $DotNetHome -RepoPath $Path -ConfigFile $ConfigFile + Set-KoreBuildSettings -ToolsSource $ToolsSource -DotNetHome $DotNetHome -RepoPath $Path -ConfigFile $ConfigFile -CI:$CI Invoke-KoreBuildCommand $Command @Arguments } finally { diff --git a/run.sh b/run.sh index 834961fc3a..02aac15874 100755 --- a/run.sh +++ b/run.sh @@ -14,10 +14,12 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" [ -z "${DOTNET_HOME:-}" ] && DOTNET_HOME="$HOME/.dotnet" verbose=false update=false +reinstall=false repo_path="$DIR" channel='' tools_source='' tools_source_suffix='' +ci=false # # Functions @@ -38,6 +40,8 @@ __usage() { echo " -s|--tools-source|-ToolsSource The base url where build tools can be downloaded. Overrides the value from the config file." echo " --tools-source-suffix|-ToolsSourceSuffix The suffix to append to tools-source. Useful for query strings." echo " -u|--update Update to the latest KoreBuild even if the lock file is present." + echo " --reinstall Reinstall KoreBuild." + echo " --ci Apply CI specific settings and environment variables." echo "" echo "Description:" echo " This function will create a file \$DIR/korebuild-lock.txt. This lock file can be committed to source, but does not have to be." @@ -62,6 +66,10 @@ get_korebuild() { version="$(echo "${version#version:}" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')" local korebuild_path="$DOTNET_HOME/buildtools/korebuild/$version" + if [ "$reinstall" = true ] && [ -d "$korebuild_path" ]; then + rm -rf "$korebuild_path" + fi + { if [ ! -d "$korebuild_path" ]; then mkdir -p "$korebuild_path" @@ -175,6 +183,12 @@ while [[ $# -gt 0 ]]; do -u|--update|-Update) update=true ;; + --reinstall|-[Rr]einstall) + reinstall=true + ;; + --ci|-[Cc][Ii]) + ci=true + ;; --verbose|-Verbose) verbose=true ;; @@ -206,17 +220,28 @@ if [ -f "$config_file" ]; then config_channel="$(jq -r 'select(.channel!=null) | .channel' "$config_file")" config_tools_source="$(jq -r 'select(.toolsSource!=null) | .toolsSource' "$config_file")" else - __warn "$config_file is invalid JSON. Its settings will be ignored." + _error "$config_file contains invalid JSON." + exit 1 fi elif __machine_has python ; then if python -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'))" >/dev/null ; then config_channel="$(python -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['channel'] if 'channel' in obj else '')")" config_tools_source="$(python -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['toolsSource'] if 'toolsSource' in obj else '')")" else - __warn "$config_file is invalid JSON. Its settings will be ignored." + _error "$config_file contains invalid JSON." + exit 1 + fi + elif __machine_has python3 ; then + if python3 -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'))" >/dev/null ; then + config_channel="$(python3 -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['channel'] if 'channel' in obj else '')")" + config_tools_source="$(python3 -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['toolsSource'] if 'toolsSource' in obj else '')")" + else + _error "$config_file contains invalid JSON." + exit 1 fi else - __warn 'Missing required command: jq or pyton. Could not parse the JSON file. Its settings will be ignored.' + _error 'Missing required command: jq or python. Could not parse the JSON file.' + exit 1 fi [ ! -z "${config_channel:-}" ] && channel="$config_channel" @@ -227,5 +252,5 @@ fi [ -z "$tools_source" ] && tools_source='https://aspnetcore.blob.core.windows.net/buildtools' get_korebuild -set_korebuildsettings "$tools_source" "$DOTNET_HOME" "$repo_path" "$config_file" +set_korebuildsettings "$tools_source" "$DOTNET_HOME" "$repo_path" "$config_file" "$ci" invoke_korebuild_command "$command" "$@" From 7b1c0f66c66da2977c99866597985f5baecf4431 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 27 May 2018 19:25:10 +0000 Subject: [PATCH 12/42] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 34 +++++++++++++++++----------------- korebuild-lock.txt | 4 ++-- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 1a63a6e079..156af7aa90 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -3,26 +3,26 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.2.0-preview1-17060 - 2.2.0-preview1-34255 - 2.2.0-preview1-34255 - 2.2.0-preview1-34255 - 2.2.0-preview1-34255 - 2.2.0-preview1-34255 - 2.2.0-preview1-34255 - 0.6.0-preview1-34255 - 2.2.0-preview1-34255 - 2.2.0-preview1-34255 + 2.2.0-preview1-17064 + 2.2.0-preview1-34326 + 2.2.0-preview1-34326 + 2.2.0-preview1-34326 + 2.2.0-preview1-34326 + 2.2.0-preview1-34326 + 2.2.0-preview1-34326 + 0.6.0-preview1-34326 + 2.2.0-preview1-34326 + 2.2.0-preview1-34326 15.6.82 - 2.2.0-preview1-34255 - 2.2.0-preview1-34255 - 2.2.0-preview1-34255 - 2.2.0-preview1-34255 - 2.2.0-preview1-34255 + 2.2.0-preview1-34326 + 2.2.0-preview1-34326 + 2.2.0-preview1-34326 + 2.2.0-preview1-34326 + 2.2.0-preview1-34326 2.0.0 2.1.0-rc1 - 2.2.0-preview1-26509-06 - 2.2.0-preview1-34255 + 2.2.0-preview1-26526-03 + 2.2.0-preview1-34326 15.6.1 2.0.3 2.3.1 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index cf2fff7def..3028b66761 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-17060 -commithash:25b4b134d6f8f7b461928f0d495cfc695ccabb5b +version:2.2.0-preview1-17064 +commithash:5380a2461b135b261646f31d1c919ab0a7b577a8 From 488fff41a787a667daddb7bab0b23ff0a54f6acc Mon Sep 17 00:00:00 2001 From: Pranav K Date: Tue, 22 May 2018 12:54:18 -0700 Subject: [PATCH 13/42] Deploy tests the same way we do for RazorSdk Remove tests marked previously skipped --- .../ApplicationWithParseErrorsTest_CoreCLR.cs | 5 +- .../ApplicationWithTagHelpersTest_CoreCLR.cs | 19 ++- .../PublishWithDebugTest_CoreCLR.cs | 56 -------- .../CoreCLRTests/SimpleAppTest_CoreCLR.cs | 3 +- .../ApplicationWithParseErrorsTest_Desktop.cs | 5 +- .../ApplicationWithTagHelpersTest_Desktop.cs | 19 ++- ...> SimpleAppTestWithPlatformx86_Desktop.cs} | 32 +++-- .../DesktopTests/SimpleAppTest_Desktop.cs | 2 +- .../Infrastructure/ApplicationTestFixture.cs | 124 ++++++++++++++---- testapps/Directory.Build.props | 6 +- testapps/Directory.Build.targets | 8 +- 11 files changed, 163 insertions(+), 116 deletions(-) delete mode 100644 test/FunctionalTests/CoreCLRTests/PublishWithDebugTest_CoreCLR.cs rename test/FunctionalTests/DesktopTests/{PublishWithDebugTest_Desktop.cs => SimpleAppTestWithPlatformx86_Desktop.cs} (53%) diff --git a/test/FunctionalTests/CoreCLRTests/ApplicationWithParseErrorsTest_CoreCLR.cs b/test/FunctionalTests/CoreCLRTests/ApplicationWithParseErrorsTest_CoreCLR.cs index 77159e5e13..076d71f6ba 100644 --- a/test/FunctionalTests/CoreCLRTests/ApplicationWithParseErrorsTest_CoreCLR.cs +++ b/test/FunctionalTests/CoreCLRTests/ApplicationWithParseErrorsTest_CoreCLR.cs @@ -24,9 +24,8 @@ namespace FunctionalTests public async Task PublishingPrintsParseErrors() { // Arrange - var applicationPath = ApplicationPaths.GetTestAppDirectory("ApplicationWithParseErrors"); - var indexPath = Path.Combine(applicationPath, "Views", "Home", "Index.cshtml"); - var viewImportsPath = Path.Combine(applicationPath, "Views", "Home", "About.cshtml"); + var indexPath = Path.Combine(Fixture.TestProjectDirectory, "Views", "Home", "Index.cshtml"); + var viewImportsPath = Path.Combine(Fixture.TestProjectDirectory, "Views", "Home", "About.cshtml"); var expectedErrors = new[] { indexPath + " (0): The code block is missing a closing \"}\" character. Make sure you have a matching \"}\" character for all the \"{\" characters within this block, and that none of the \"}\" characters are being interpreted as markup.", diff --git a/test/FunctionalTests/CoreCLRTests/ApplicationWithTagHelpersTest_CoreCLR.cs b/test/FunctionalTests/CoreCLRTests/ApplicationWithTagHelpersTest_CoreCLR.cs index b1d3664da6..3f42c7c1c7 100644 --- a/test/FunctionalTests/CoreCLRTests/ApplicationWithTagHelpersTest_CoreCLR.cs +++ b/test/FunctionalTests/CoreCLRTests/ApplicationWithTagHelpersTest_CoreCLR.cs @@ -1,7 +1,10 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +using System.IO; using System.Threading.Tasks; +using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Testing; using Xunit; using Xunit.Abstractions; @@ -9,10 +12,10 @@ using Xunit.Abstractions; namespace FunctionalTests { public class ApplicationWithTagHelpersTest_CoreCLR : - LoggedTest, IClassFixture> + LoggedTest, IClassFixture { public ApplicationWithTagHelpersTest_CoreCLR( - CoreCLRApplicationTestFixture fixture, + ApplicationWithTagHelpersTestFixture fixture, ITestOutputHelper output) : base(output) { @@ -56,5 +59,17 @@ namespace FunctionalTests TestEmbeddedResource.AssertContent($"ApplicationWithTagHelpers.Home.LocalTagHelper.txt", response); } } + + public class ApplicationWithTagHelpersTestFixture : CoreCLRApplicationTestFixture + { + protected override Task CreateDeploymentAsyncCore(ILoggerFactory loggerFactory) + { + CopyDirectory( + new DirectoryInfo(Path.Combine(ApplicationPath, "..", "ClassLibraryTagHelper")), + new DirectoryInfo(Path.Combine(WorkingDirectory, "ClassLibraryTagHelper"))); + + return base.CreateDeploymentAsyncCore(loggerFactory); + } + } } } diff --git a/test/FunctionalTests/CoreCLRTests/PublishWithDebugTest_CoreCLR.cs b/test/FunctionalTests/CoreCLRTests/PublishWithDebugTest_CoreCLR.cs deleted file mode 100644 index c66e4b68a5..0000000000 --- a/test/FunctionalTests/CoreCLRTests/PublishWithDebugTest_CoreCLR.cs +++ /dev/null @@ -1,56 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System.IO; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Server.IntegrationTesting; -using Microsoft.Extensions.Logging.Testing; -using Xunit; -using Xunit.Abstractions; - -namespace FunctionalTests -{ - public class PublishWithDebugTest_CoreCLR : - LoggedTest, IClassFixture - { - public PublishWithDebugTest_CoreCLR( - TestFixture fixture, - ITestOutputHelper output) - : base(output) - { - Fixture = fixture; - } - - public ApplicationTestFixture Fixture { get; } - - [Fact] - public async Task PublishingInDebugWorks() - { - using (StartLog(out var loggerFactory)) - { - // Arrange - var deployment = await Fixture.CreateDeploymentAsync(loggerFactory); - - // Assert - var expected = Path.Combine(deployment.ContentRoot, $"{Fixture.ApplicationName}.PrecompiledViews.dll"); - Assert.True(File.Exists(expected), $"File {expected} does not exist."); - } - } - - public class TestFixture : CoreCLRApplicationTestFixture - { - public TestFixture() - { - PublishOnly = true; - } - - protected override DeploymentParameters GetDeploymentParameters() - { - var deploymentParameters = base.GetDeploymentParameters(); - deploymentParameters.Configuration = "Debug"; - - return deploymentParameters; - } - } - } -} diff --git a/test/FunctionalTests/CoreCLRTests/SimpleAppTest_CoreCLR.cs b/test/FunctionalTests/CoreCLRTests/SimpleAppTest_CoreCLR.cs index 9b90c31a17..18e17b588e 100644 --- a/test/FunctionalTests/CoreCLRTests/SimpleAppTest_CoreCLR.cs +++ b/test/FunctionalTests/CoreCLRTests/SimpleAppTest_CoreCLR.cs @@ -1,7 +1,6 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using System.IO; using System.Threading.Tasks; using Microsoft.Extensions.Logging.Testing; using Xunit; @@ -22,7 +21,7 @@ namespace FunctionalTests public ApplicationTestFixture Fixture { get; } - [Fact(Skip = "Unblocking the build - https://github.com/aspnet/MvcPrecompilation/issues/224")] + [Fact] public async Task Precompilation_WorksForSimpleApps() { using (StartLog(out var loggerFactory)) diff --git a/test/FunctionalTests/DesktopTests/ApplicationWithParseErrorsTest_Desktop.cs b/test/FunctionalTests/DesktopTests/ApplicationWithParseErrorsTest_Desktop.cs index 587cbd9b32..b0fcb22c79 100644 --- a/test/FunctionalTests/DesktopTests/ApplicationWithParseErrorsTest_Desktop.cs +++ b/test/FunctionalTests/DesktopTests/ApplicationWithParseErrorsTest_Desktop.cs @@ -27,9 +27,8 @@ namespace FunctionalTests public async Task PublishingPrintsParseErrors() { // Arrange - var applicationPath = ApplicationPaths.GetTestAppDirectory("ApplicationWithParseErrors"); - var indexPath = Path.Combine(applicationPath, "Views", "Home", "Index.cshtml"); - var viewImportsPath = Path.Combine(applicationPath, "Views", "Home", "About.cshtml"); + var indexPath = Path.Combine(Fixture.TestProjectDirectory, "Views", "Home", "Index.cshtml"); + var viewImportsPath = Path.Combine(Fixture.TestProjectDirectory, "Views", "Home", "About.cshtml"); var expectedErrors = new[] { indexPath + " (0): The code block is missing a closing \"}\" character. Make sure you have a matching \"}\" character for all the \"{\" characters within this block, and that none of the \"}\" characters are being interpreted as markup.", diff --git a/test/FunctionalTests/DesktopTests/ApplicationWithTagHelpersTest_Desktop.cs b/test/FunctionalTests/DesktopTests/ApplicationWithTagHelpersTest_Desktop.cs index 8b3508be2b..68d661e2d8 100644 --- a/test/FunctionalTests/DesktopTests/ApplicationWithTagHelpersTest_Desktop.cs +++ b/test/FunctionalTests/DesktopTests/ApplicationWithTagHelpersTest_Desktop.cs @@ -1,8 +1,11 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. +using System.IO; using System.Threading.Tasks; +using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Testing.xunit; +using Microsoft.Extensions.Logging; using Microsoft.Extensions.Logging.Testing; using Xunit; using Xunit.Abstractions; @@ -12,10 +15,10 @@ namespace FunctionalTests [OSSkipCondition(OperatingSystems.Linux)] [OSSkipCondition(OperatingSystems.MacOSX)] public class ApplicationWithTagHelpersTest_Desktop : - LoggedTest, IClassFixture> + LoggedTest, IClassFixture { public ApplicationWithTagHelpersTest_Desktop( - DesktopApplicationTestFixture fixture, + ApplicationWithTagHelpersTestFixture fixture, ITestOutputHelper output) : base(output) { @@ -59,5 +62,17 @@ namespace FunctionalTests TestEmbeddedResource.AssertContent($"ApplicationWithTagHelpers.Home.LocalTagHelper.txt", response); } } + + public class ApplicationWithTagHelpersTestFixture : DesktopApplicationTestFixture + { + protected override Task CreateDeploymentAsyncCore(ILoggerFactory loggerFactory) + { + CopyDirectory( + new DirectoryInfo(Path.Combine(ApplicationPath, "..", "ClassLibraryTagHelper")), + new DirectoryInfo(Path.Combine(WorkingDirectory, "ClassLibraryTagHelper"))); + + return base.CreateDeploymentAsyncCore(loggerFactory); + } + } } } diff --git a/test/FunctionalTests/DesktopTests/PublishWithDebugTest_Desktop.cs b/test/FunctionalTests/DesktopTests/SimpleAppTestWithPlatformx86_Desktop.cs similarity index 53% rename from test/FunctionalTests/DesktopTests/PublishWithDebugTest_Desktop.cs rename to test/FunctionalTests/DesktopTests/SimpleAppTestWithPlatformx86_Desktop.cs index 8dd660f420..ca47095612 100644 --- a/test/FunctionalTests/DesktopTests/PublishWithDebugTest_Desktop.cs +++ b/test/FunctionalTests/DesktopTests/SimpleAppTestWithPlatformx86_Desktop.cs @@ -1,7 +1,6 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. -using System.IO; using System.Threading.Tasks; using Microsoft.AspNetCore.Server.IntegrationTesting; using Microsoft.AspNetCore.Testing.xunit; @@ -13,11 +12,11 @@ namespace FunctionalTests { [OSSkipCondition(OperatingSystems.Linux)] [OSSkipCondition(OperatingSystems.MacOSX)] - public class PublishWithDebugTest_Desktop : - LoggedTest, IClassFixture + public class SimpleAppTestWithPlatformx86_Desktop : + LoggedTest, IClassFixture> { - public PublishWithDebugTest_Desktop( - TestFixture fixture, + public SimpleAppTestWithPlatformx86_Desktop( + DesktopApplicationTestFixture fixture, ITestOutputHelper output) : base(output) { @@ -27,32 +26,31 @@ namespace FunctionalTests public ApplicationTestFixture Fixture { get; } [ConditionalFact] - public async Task PublishingInDebugWorks() + public async Task Precompilation_PublishingForPlatform() { using (StartLog(out var loggerFactory)) { // Arrange var deployment = await Fixture.CreateDeploymentAsync(loggerFactory); + // Act + var response = await deployment.HttpClient.GetStringWithRetryAsync( + deployment.ApplicationBaseUri, + loggerFactory.CreateLogger(Fixture.ApplicationName)); + // Assert - var expected = Path.Combine(deployment.ContentRoot, $"{Fixture.ApplicationName}.PrecompiledViews.dll"); - Assert.True(File.Exists(expected), $"File {expected} does not exist."); + TestEmbeddedResource.AssertContent("SimpleAppTest.Home.Index.txt", response); } } - public class TestFixture : DesktopApplicationTestFixture + public class SimpleAppTestWithPlatformx86_DesktopFixture : DesktopApplicationTestFixture { - public TestFixture() - { - PublishOnly = true; - } - protected override DeploymentParameters GetDeploymentParameters() { - var deploymentParameters = base.GetDeploymentParameters(); - deploymentParameters.Configuration = "Debug"; + var parameters = base.GetDeploymentParameters(); + parameters.AdditionalPublishParameters = "/p:Platform=x86"; - return deploymentParameters; + return parameters; } } } diff --git a/test/FunctionalTests/DesktopTests/SimpleAppTest_Desktop.cs b/test/FunctionalTests/DesktopTests/SimpleAppTest_Desktop.cs index fb70a5a53e..e3fa91caa5 100644 --- a/test/FunctionalTests/DesktopTests/SimpleAppTest_Desktop.cs +++ b/test/FunctionalTests/DesktopTests/SimpleAppTest_Desktop.cs @@ -25,7 +25,7 @@ namespace FunctionalTests public ApplicationTestFixture Fixture { get; } - [ConditionalFact(Skip = "Unblocking the build - https://github.com/aspnet/MvcPrecompilation/issues/224")] + [ConditionalFact] public async Task Precompilation_WorksForSimpleApps() { using (StartLog(out var loggerFactory)) diff --git a/test/FunctionalTests/Infrastructure/ApplicationTestFixture.cs b/test/FunctionalTests/Infrastructure/ApplicationTestFixture.cs index 4df83aeec5..931e14422d 100644 --- a/test/FunctionalTests/Infrastructure/ApplicationTestFixture.cs +++ b/test/FunctionalTests/Infrastructure/ApplicationTestFixture.cs @@ -3,9 +3,11 @@ using System; using System.Collections.Generic; +using System.IO; using System.Threading; using System.Threading.Tasks; using Microsoft.AspNetCore.Server.IntegrationTesting; +using Microsoft.AspNetCore.Testing; using Microsoft.Extensions.Logging; namespace FunctionalTests @@ -13,28 +15,44 @@ namespace FunctionalTests public abstract class ApplicationTestFixture : IDisposable { private const string DotnetCLITelemetryOptOut = "DOTNET_CLI_TELEMETRY_OPTOUT"; - private static readonly SemaphoreSlim _deploymentLock = new SemaphoreSlim(initialCount: 1); + private static readonly string SolutionDirectory; + private Task _deploymentTask; private ApplicationDeployer _deployer; + static ApplicationTestFixture() + { + SolutionDirectory = TestPathUtilities.GetSolutionRootDirectory("RazorViewCompilation"); + if (!SolutionDirectory.EndsWith(Path.DirectorySeparatorChar.ToString())) + { + SolutionDirectory += Path.DirectorySeparatorChar; + } + } + protected ApplicationTestFixture(string applicationName, string applicationPath) { ApplicationName = applicationName; ApplicationPath = applicationPath ?? ApplicationPaths.GetTestAppDirectory(applicationName); + WorkingDirectory = Path.Combine(Path.GetTempPath(), "PrecompilationTool", Path.GetRandomFileName()); + TestProjectDirectory = Path.Combine(WorkingDirectory, ApplicationName); } public string ApplicationName { get; } public string ApplicationPath { get; } + public string WorkingDirectory { get; } + + public string TestProjectDirectory { get; } + public bool PublishOnly { get; set; } protected abstract DeploymentParameters GetDeploymentParameters(); protected DeploymentParameters GetDeploymentParameters(RuntimeFlavor flavor, string targetFramework) - => GetDeploymentParameters(ApplicationPath, ApplicationName, flavor, targetFramework); + => GetDeploymentParameters(TestProjectDirectory, ApplicationName, flavor, targetFramework); - public static DeploymentParameters GetDeploymentParameters(string applicationPath, string applicationName, RuntimeFlavor flavor, string targetFramework) + private static DeploymentParameters GetDeploymentParameters(string applicationPath, string applicationName, RuntimeFlavor flavor, string targetFramework) { // This determines the configuration of the the test project and consequently the configuration the src projects are most likely built in. var projectConfiguration = @@ -54,15 +72,17 @@ namespace FunctionalTests { ApplicationName = applicationName, PublishApplicationBeforeDeployment = true, - Configuration = "Release", + Configuration = projectConfiguration, EnvironmentVariables = { new KeyValuePair(DotnetCLITelemetryOptOut, "1"), + new KeyValuePair("SolutionDirectory", SolutionDirectory), new KeyValuePair("SolutionConfiguration", projectConfiguration), }, PublishEnvironmentVariables = { new KeyValuePair(DotnetCLITelemetryOptOut, "1"), + new KeyValuePair("SolutionDirectory", SolutionDirectory), new KeyValuePair("SolutionConfiguration", projectConfiguration), }, TargetFramework = targetFramework, @@ -78,35 +98,89 @@ namespace FunctionalTests _deploymentTask.Result.HttpClient?.Dispose(); } + CleanupWorkingDirectory(); + _deployer?.Dispose(); } - public async Task CreateDeploymentAsync(ILoggerFactory loggerFactory) + public Task CreateDeploymentAsync(ILoggerFactory loggerFactory) { - try + if (_deploymentTask == null) { - await _deploymentLock.WaitAsync(TimeSpan.FromSeconds(10)); - if (_deploymentTask == null) - { - var deploymentParameters = GetDeploymentParameters(); - if (PublishOnly) - { - _deployer = new PublishOnlyDeployer(deploymentParameters, loggerFactory); - } - else - { - _deployer = ApplicationDeployerFactory.Create(deploymentParameters, loggerFactory); - } + _deploymentTask = CreateDeploymentAsyncCore(loggerFactory); + } - _deploymentTask = _deployer.DeployAsync(); + return _deploymentTask; + } + + protected virtual Task CreateDeploymentAsyncCore(ILoggerFactory loggerFactory) + { + CopyDirectory(new DirectoryInfo(ApplicationPath), new DirectoryInfo(TestProjectDirectory)); + + File.Copy(Path.Combine(SolutionDirectory, "global.json"), Path.Combine(TestProjectDirectory, "global.json")); + File.Copy(Path.Combine(ApplicationPath, "..", "Directory.Build.props"), Path.Combine(TestProjectDirectory, "Directory.Build.props")); + File.Copy(Path.Combine(ApplicationPath, "..", "Directory.Build.targets"), Path.Combine(TestProjectDirectory, "Directory.Build.targets")); + + var deploymentParameters = GetDeploymentParameters(); + if (PublishOnly) + { + _deployer = new PublishOnlyDeployer(deploymentParameters, loggerFactory); + } + else + { + _deployer = ApplicationDeployerFactory.Create(deploymentParameters, loggerFactory); + } + + return _deployer.DeployAsync(); + } + + public void CopyDirectory(DirectoryInfo source, DirectoryInfo destination, bool recursive = true) + { + // Recurse into subdirectories + foreach (var directory in source.EnumerateDirectories()) + { + if (directory.Name == "bin") + { + continue; + } + + var created = destination.CreateSubdirectory(directory.Name); + + // We only want to copy the restore artifacts from obj directory while ignoring in any configuration specific directories + CopyDirectory(directory, created, recursive: directory.Name != "obj"); + } + + foreach (var file in source.EnumerateFiles()) + { + file.CopyTo(Path.Combine(destination.FullName, file.Name)); + } + } + + private void CleanupWorkingDirectory() + { + var tries = 5; + var sleep = TimeSpan.FromSeconds(3); + + for (var i = 0; i < tries; i++) + { + try + { + if (Directory.Exists(WorkingDirectory)) + { + Directory.Delete(WorkingDirectory, recursive: true); + } + return; + } + catch when (i < tries - 1) + { + Console.WriteLine($"Failed to delete directory {TestProjectDirectory}, trying again."); + Thread.Sleep(sleep); + } + catch + { + // Do nothing } } - finally - { - _deploymentLock.Release(); - } - - return await _deploymentTask; } } } diff --git a/testapps/Directory.Build.props b/testapps/Directory.Build.props index 4c4c409bf9..2c0a965d5b 100644 --- a/testapps/Directory.Build.props +++ b/testapps/Directory.Build.props @@ -1,5 +1,9 @@ - + + $(MSBuildThisFileDirectory)..\ + + + netcoreapp2.2 diff --git a/testapps/Directory.Build.targets b/testapps/Directory.Build.targets index 350846ecee..03b1ec5b64 100644 --- a/testapps/Directory.Build.targets +++ b/testapps/Directory.Build.targets @@ -1,13 +1,13 @@ - + $(MvcRazorCompileOnPublish) $(Configuration) - <_MvcViewCompilationTasksPath>$(MSBuildThisFileDirectory)..\src\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tasks\bin\$(SolutionConfiguration)\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tasks.dll - <_MvcViewCompilationBinariesDir>$(MSBuildThisFileDirectory)..\src\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation\bin\$(SolutionConfiguration)\ + <_MvcViewCompilationTasksPath>$(SolutionDirectory)src\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tasks\bin\$(SolutionConfiguration)\netstandard2.0\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tasks.dll + <_MvcViewCompilationBinariesDir>$(SolutionDirectory)src\Microsoft.AspNetCore.Mvc.Razor.ViewCompilation\bin\$(SolutionConfiguration)\ - From 3ef5a9048d8f88a652f93461673e1cadaa0e9c2c Mon Sep 17 00:00:00 2001 From: Pranav K Date: Thu, 24 May 2018 13:38:57 -0700 Subject: [PATCH 14/42] Update deps --- test/FunctionalTests/FunctionalTests.csproj | 4 +++- test/FunctionalTests/Infrastructure/ApplicationTestFixture.cs | 2 ++ testapps/Directory.Build.props | 3 +++ testapps/SimpleApp/SimpleApp.csproj | 2 -- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/test/FunctionalTests/FunctionalTests.csproj b/test/FunctionalTests/FunctionalTests.csproj index c0f7d7b8b7..7a6a4d894b 100644 --- a/test/FunctionalTests/FunctionalTests.csproj +++ b/test/FunctionalTests/FunctionalTests.csproj @@ -1,4 +1,4 @@ - + $(StandardTestTfms) @@ -8,6 +8,8 @@ false false false + + win7-x64 diff --git a/test/FunctionalTests/Infrastructure/ApplicationTestFixture.cs b/test/FunctionalTests/Infrastructure/ApplicationTestFixture.cs index 931e14422d..698a598593 100644 --- a/test/FunctionalTests/Infrastructure/ApplicationTestFixture.cs +++ b/test/FunctionalTests/Infrastructure/ApplicationTestFixture.cs @@ -3,6 +3,7 @@ using System; using System.Collections.Generic; +using System.Diagnostics; using System.IO; using System.Threading; using System.Threading.Tasks; @@ -71,6 +72,7 @@ namespace FunctionalTests RuntimeArchitecture.x64) { ApplicationName = applicationName, + ApplicationType = flavor == RuntimeFlavor.Clr ? ApplicationType.Standalone : ApplicationType.Portable, PublishApplicationBeforeDeployment = true, Configuration = projectConfiguration, EnvironmentVariables = diff --git a/testapps/Directory.Build.props b/testapps/Directory.Build.props index 2c0a965d5b..4d776f550d 100644 --- a/testapps/Directory.Build.props +++ b/testapps/Directory.Build.props @@ -10,6 +10,9 @@ $(DeveloperBuildTestAppTfms) netcoreapp2.2;netcoreapp2.0 $(StandardTestAppTfms);net461 + + + win7-x64 diff --git a/testapps/SimpleApp/SimpleApp.csproj b/testapps/SimpleApp/SimpleApp.csproj index d484bc0298..f330f2386d 100644 --- a/testapps/SimpleApp/SimpleApp.csproj +++ b/testapps/SimpleApp/SimpleApp.csproj @@ -2,8 +2,6 @@ $(StandardTestAppTfms) - win7-x86;debian-x64 - true From 3bc13cdfbfacf3b29686219fd261fc56d0aaa7b8 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 3 Jun 2018 19:24:22 +0000 Subject: [PATCH 15/42] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 36 ++++++++++++++++++------------------ korebuild-lock.txt | 4 ++-- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 156af7aa90..f6d0d6d334 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -3,26 +3,26 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.2.0-preview1-17064 - 2.2.0-preview1-34326 - 2.2.0-preview1-34326 - 2.2.0-preview1-34326 - 2.2.0-preview1-34326 - 2.2.0-preview1-34326 - 2.2.0-preview1-34326 - 0.6.0-preview1-34326 - 2.2.0-preview1-34326 - 2.2.0-preview1-34326 + 2.2.0-preview1-17067 + 2.2.0-preview1-34373 + 2.2.0-preview1-34373 + 2.2.0-preview1-34373 + 2.2.0-preview1-34373 + 2.2.0-preview1-34373 + 2.2.0-preview1-34373 + 0.6.0-preview1-34373 + 2.2.0-preview1-34373 + 2.2.0-preview1-34373 15.6.82 - 2.2.0-preview1-34326 - 2.2.0-preview1-34326 - 2.2.0-preview1-34326 - 2.2.0-preview1-34326 - 2.2.0-preview1-34326 + 2.2.0-preview1-34373 + 2.2.0-preview1-34373 + 2.2.0-preview1-34373 + 2.2.0-preview1-34373 + 2.2.0-preview1-34373 2.0.0 - 2.1.0-rc1 - 2.2.0-preview1-26526-03 - 2.2.0-preview1-34326 + 2.1.0 + 2.2.0-preview1-26531-03 + 2.2.0-preview1-34373 15.6.1 2.0.3 2.3.1 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 3028b66761..06ba6285b7 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-17064 -commithash:5380a2461b135b261646f31d1c919ab0a7b577a8 +version:2.2.0-preview1-17067 +commithash:2af0e2e3d02329b4f0290061ab9bd8c7ca1aa26f From 996af7ccdc5f8bd248633984e0678f30d2463914 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Tue, 5 Jun 2018 22:34:06 -0700 Subject: [PATCH 16/42] Add certificate names for code signing --- Directory.Build.props | 2 ++ korebuild-lock.txt | 4 ++-- .../Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.csproj | 7 +++++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index 64f6af34d3..c7003b9eea 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -14,6 +14,8 @@ $(MSBuildThisFileDirectory) $(MSBuildThisFileDirectory)build\Key.snk true + Microsoft + MicrosoftNuGet true true diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 06ba6285b7..b679b80427 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-17067 -commithash:2af0e2e3d02329b4f0290061ab9bd8c7ca1aa26f +version:2.2.0-preview1-17075 +commithash:d9f07c7f313a0af1d49f003f5424b4dbbdd3e09f diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.csproj b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.csproj index 6e855a8ed3..b9453e0891 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.csproj +++ b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.csproj @@ -22,6 +22,13 @@ + + + + + + + Date: Thu, 7 Jun 2018 19:43:43 +0000 Subject: [PATCH 17/42] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 34 +++++++++++++++++----------------- korebuild-lock.txt | 4 ++-- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index f6d0d6d334..128b1d3365 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -3,26 +3,26 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.2.0-preview1-17067 - 2.2.0-preview1-34373 - 2.2.0-preview1-34373 - 2.2.0-preview1-34373 - 2.2.0-preview1-34373 - 2.2.0-preview1-34373 - 2.2.0-preview1-34373 - 0.6.0-preview1-34373 - 2.2.0-preview1-34373 - 2.2.0-preview1-34373 + 2.2.0-preview1-17081 + 2.2.0-preview1-34411 + 2.2.0-preview1-34411 + 2.2.0-preview1-34411 + 2.2.0-preview1-34411 + 2.2.0-preview1-34411 + 2.2.0-preview1-34411 + 0.6.0-preview1-34411 + 2.2.0-preview1-34411 + 2.2.0-preview1-34411 15.6.82 - 2.2.0-preview1-34373 - 2.2.0-preview1-34373 - 2.2.0-preview1-34373 - 2.2.0-preview1-34373 - 2.2.0-preview1-34373 + 2.2.0-preview1-34411 + 2.2.0-preview1-34411 + 2.2.0-preview1-34411 + 2.2.0-preview1-34411 + 2.2.0-preview1-34411 2.0.0 2.1.0 - 2.2.0-preview1-26531-03 - 2.2.0-preview1-34373 + 2.2.0-preview1-26606-01 + 2.2.0-preview1-34411 15.6.1 2.0.3 2.3.1 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index b679b80427..deb7e546f0 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-17075 -commithash:d9f07c7f313a0af1d49f003f5424b4dbbdd3e09f +version:2.2.0-preview1-17081 +commithash:73f09c256e2a54270951562ecc0ef4a953926c36 From 70ca2a8240fe79367adc70fcc0e4555f9751284d Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Thu, 7 Jun 2018 15:47:02 -0700 Subject: [PATCH 18/42] Adding VSTS file --- .vsts-pipelines/builds/ci-internal.yml | 13 +++++++++++++ .vsts-pipelines/builds/ci-public.yml | 15 +++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 .vsts-pipelines/builds/ci-internal.yml create mode 100644 .vsts-pipelines/builds/ci-public.yml diff --git a/.vsts-pipelines/builds/ci-internal.yml b/.vsts-pipelines/builds/ci-internal.yml new file mode 100644 index 0000000000..d7ceb76378 --- /dev/null +++ b/.vsts-pipelines/builds/ci-internal.yml @@ -0,0 +1,13 @@ +trigger: +- dev +- release/* + +resources: + repositories: + - repository: buildtools + type: git + name: aspnet-BuildTools + ref: refs/heads/dev + +phases: +- template: .vsts-pipelines/templates/project-ci.yml@buildtools diff --git a/.vsts-pipelines/builds/ci-public.yml b/.vsts-pipelines/builds/ci-public.yml new file mode 100644 index 0000000000..b7f25723f8 --- /dev/null +++ b/.vsts-pipelines/builds/ci-public.yml @@ -0,0 +1,15 @@ +trigger: +- dev +- release/* + +# See https://github.com/aspnet/BuildTools +resources: + repositories: + - repository: buildtools + type: github + endpoint: DotNet-Bot GitHub Connection + name: aspnet/BuildTools + ref: refs/heads/dev + +phases: +- template: .vsts-pipelines/templates/project-ci.yml@buildtools From 3fe25e9b3470327fc83305d33964cd7eda3e0a1d Mon Sep 17 00:00:00 2001 From: Doug Bunting Date: Sat, 23 Jun 2018 15:00:01 -0700 Subject: [PATCH 19/42] Skip flaky tests - #277 - see also aspnet/Coherence-Signed#887 --- .../CoreCLRTests/ApplicationWithParseErrorsTest_CoreCLR.cs | 4 ++-- .../DesktopTests/ApplicationWithParseErrorsTest_Desktop.cs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/FunctionalTests/CoreCLRTests/ApplicationWithParseErrorsTest_CoreCLR.cs b/test/FunctionalTests/CoreCLRTests/ApplicationWithParseErrorsTest_CoreCLR.cs index 076d71f6ba..ce66f29457 100644 --- a/test/FunctionalTests/CoreCLRTests/ApplicationWithParseErrorsTest_CoreCLR.cs +++ b/test/FunctionalTests/CoreCLRTests/ApplicationWithParseErrorsTest_CoreCLR.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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; @@ -20,7 +20,7 @@ namespace FunctionalTests public ApplicationTestFixture Fixture { get; } - [Fact] + [Fact(Skip = "Flaky test in many build configurations. See issue #277.")] public async Task PublishingPrintsParseErrors() { // Arrange diff --git a/test/FunctionalTests/DesktopTests/ApplicationWithParseErrorsTest_Desktop.cs b/test/FunctionalTests/DesktopTests/ApplicationWithParseErrorsTest_Desktop.cs index b0fcb22c79..7c6d9a9835 100644 --- a/test/FunctionalTests/DesktopTests/ApplicationWithParseErrorsTest_Desktop.cs +++ b/test/FunctionalTests/DesktopTests/ApplicationWithParseErrorsTest_Desktop.cs @@ -1,4 +1,4 @@ -// Copyright (c) .NET Foundation. All rights reserved. +// 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; @@ -23,7 +23,7 @@ namespace FunctionalTests public ApplicationTestFixture Fixture { get; } - [ConditionalFact] + [ConditionalFact(Skip = "Flaky test in many build configurations.See issue #277.")] public async Task PublishingPrintsParseErrors() { // Arrange From 3cd73aa2fa641db30c0a1454d8e1a0205bdc36da Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Mon, 25 Jun 2018 11:25:29 -0700 Subject: [PATCH 20/42] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 34 +++++++++++++++++----------------- korebuild-lock.txt | 4 ++-- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 128b1d3365..8015520b88 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -3,26 +3,26 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.2.0-preview1-17081 - 2.2.0-preview1-34411 - 2.2.0-preview1-34411 - 2.2.0-preview1-34411 - 2.2.0-preview1-34411 - 2.2.0-preview1-34411 - 2.2.0-preview1-34411 - 0.6.0-preview1-34411 - 2.2.0-preview1-34411 - 2.2.0-preview1-34411 + 2.2.0-preview1-17090 + 2.2.0-preview1-34530 + 2.2.0-preview1-34530 + 2.2.0-preview1-34530 + 2.2.0-preview1-34530 + 2.2.0-preview1-34530 + 2.2.0-preview1-34530 + 0.6.0-preview1-34530 + 2.2.0-preview1-34530 + 2.2.0-preview1-34530 15.6.82 - 2.2.0-preview1-34411 - 2.2.0-preview1-34411 - 2.2.0-preview1-34411 - 2.2.0-preview1-34411 - 2.2.0-preview1-34411 + 2.2.0-preview1-34530 + 2.2.0-preview1-34530 + 2.2.0-preview1-34530 + 2.2.0-preview1-34530 + 2.2.0-preview1-34530 2.0.0 2.1.0 - 2.2.0-preview1-26606-01 - 2.2.0-preview1-34411 + 2.2.0-preview1-26618-02 + 2.2.0-preview1-34530 15.6.1 2.0.3 2.3.1 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index deb7e546f0..a8109db529 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-17081 -commithash:73f09c256e2a54270951562ecc0ef4a953926c36 +version:2.2.0-preview1-17090 +commithash:b19e903e946579cd9482089bce7d917e8bacd765 From ebd30270a439e5a62769857132111cd3dbe28a68 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 28 Jun 2018 16:21:09 -0700 Subject: [PATCH 21/42] Update infrastructure for the 2.2 release --- .vsts-pipelines/builds/ci-internal.yml | 4 ++-- .vsts-pipelines/builds/ci-public.yml | 6 +++--- build/repo.props | 1 + korebuild.json | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.vsts-pipelines/builds/ci-internal.yml b/.vsts-pipelines/builds/ci-internal.yml index d7ceb76378..dc7b8a3cb9 100644 --- a/.vsts-pipelines/builds/ci-internal.yml +++ b/.vsts-pipelines/builds/ci-internal.yml @@ -1,5 +1,5 @@ trigger: -- dev +- master - release/* resources: @@ -7,7 +7,7 @@ resources: - repository: buildtools type: git name: aspnet-BuildTools - ref: refs/heads/dev + ref: refs/heads/release/2.2 phases: - template: .vsts-pipelines/templates/project-ci.yml@buildtools diff --git a/.vsts-pipelines/builds/ci-public.yml b/.vsts-pipelines/builds/ci-public.yml index b7f25723f8..f5087d9c30 100644 --- a/.vsts-pipelines/builds/ci-public.yml +++ b/.vsts-pipelines/builds/ci-public.yml @@ -1,5 +1,5 @@ trigger: -- dev +- master - release/* # See https://github.com/aspnet/BuildTools @@ -9,7 +9,7 @@ resources: type: github endpoint: DotNet-Bot GitHub Connection name: aspnet/BuildTools - ref: refs/heads/dev - + ref: refs/heads/release/2.2 + phases: - template: .vsts-pipelines/templates/project-ci.yml@buildtools diff --git a/build/repo.props b/build/repo.props index 17a98ac7e7..f1fe24dd27 100644 --- a/build/repo.props +++ b/build/repo.props @@ -4,6 +4,7 @@ Internal.AspNetCore.Universe.Lineup + 2.2.0-* https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json diff --git a/korebuild.json b/korebuild.json index bd5d51a51b..d217d06e3e 100644 --- a/korebuild.json +++ b/korebuild.json @@ -1,4 +1,4 @@ { - "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/dev/tools/korebuild.schema.json", - "channel": "dev" + "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/release/2.2/tools/korebuild.schema.json", + "channel": "release/2.2" } From 40c00c4165294a6c821797b778c84a6a8d82041f Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 8 Jul 2018 12:24:30 -0700 Subject: [PATCH 22/42] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 38 +++++++++++++++++++------------------- korebuild-lock.txt | 4 ++-- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 8015520b88..df292d6544 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -3,30 +3,30 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.2.0-preview1-17090 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 0.6.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 + 2.2.0-preview1-17099 + 2.2.0-preview1-34640 + 2.2.0-preview1-34640 + 2.2.0-preview1-34640 + 2.2.0-preview1-34640 + 2.2.0-preview1-34640 + 2.2.0-preview1-34640 + 0.6.0-preview1-34640 + 2.2.0-preview1-34640 + 2.2.0-preview1-34640 15.6.82 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.2.0-preview1-34530 - 2.0.0 - 2.1.0 + 2.2.0-preview1-34640 + 2.2.0-preview1-34640 + 2.2.0-preview1-34640 + 2.2.0-preview1-34640 + 2.2.0-preview1-34640 + 2.0.7 + 2.1.1 2.2.0-preview1-26618-02 - 2.2.0-preview1-34530 + 2.2.0-preview1-34640 15.6.1 2.0.3 2.3.1 - 2.4.0-beta.1.build3945 + 2.4.0-rc.1.build4038 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index a8109db529..27e2e80f9a 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-17090 -commithash:b19e903e946579cd9482089bce7d917e8bacd765 +version:2.2.0-preview1-17099 +commithash:263ed1db9866b6b419b1f5d5189a712aa218acb3 From 4c3dec4fd2d52470c8f9ba293b4f17bf060fb50c Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 15 Jul 2018 12:23:43 -0700 Subject: [PATCH 23/42] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index df292d6544..b04e711a01 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,25 +4,25 @@ 2.2.0-preview1-17099 - 2.2.0-preview1-34640 - 2.2.0-preview1-34640 - 2.2.0-preview1-34640 - 2.2.0-preview1-34640 - 2.2.0-preview1-34640 - 2.2.0-preview1-34640 - 0.6.0-preview1-34640 - 2.2.0-preview1-34640 - 2.2.0-preview1-34640 + 2.2.0-preview1-34694 + 2.2.0-preview1-34694 + 2.2.0-preview1-34694 + 2.2.0-preview1-34694 + 2.2.0-preview1-34694 + 2.2.0-preview1-34694 + 0.6.0-preview1-34694 + 2.2.0-preview1-34694 + 2.2.0-preview1-34694 15.6.82 - 2.2.0-preview1-34640 - 2.2.0-preview1-34640 - 2.2.0-preview1-34640 - 2.2.0-preview1-34640 - 2.2.0-preview1-34640 - 2.0.7 - 2.1.1 + 2.2.0-preview1-34694 + 2.2.0-preview1-34694 + 2.2.0-preview1-34694 + 2.2.0-preview1-34694 + 2.2.0-preview1-34694 + 2.0.9 + 2.1.2 2.2.0-preview1-26618-02 - 2.2.0-preview1-34640 + 2.2.0-preview1-34694 15.6.1 2.0.3 2.3.1 From 03ee3bfe492f3e82cc9e440a8135bd6f165e696d Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 22 Jul 2018 12:22:54 -0700 Subject: [PATCH 24/42] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index b04e711a01..c8d6cb7ca6 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,25 +4,25 @@ 2.2.0-preview1-17099 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 0.6.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 + 2.2.0-preview1-34755 + 2.2.0-preview1-34755 + 2.2.0-preview1-34755 + 2.2.0-preview1-34755 + 2.2.0-preview1-34755 + 2.2.0-preview1-34755 + 0.6.0-preview1-34755 + 2.2.0-preview1-34755 + 2.2.0-preview1-34755 15.6.82 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 - 2.2.0-preview1-34694 + 2.2.0-preview1-34755 + 2.2.0-preview1-34755 + 2.2.0-preview1-34755 + 2.2.0-preview1-34755 + 2.2.0-preview1-34755 2.0.9 2.1.2 2.2.0-preview1-26618-02 - 2.2.0-preview1-34694 + 2.2.0-preview1-34755 15.6.1 2.0.3 2.3.1 From 52d5164db838d2c1f27a377daede724af3292ba2 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 29 Jul 2018 12:22:23 -0700 Subject: [PATCH 25/42] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 35 ++++++++++++++++++----------------- korebuild-lock.txt | 4 ++-- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index c8d6cb7ca6..19a9ab159a 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -3,30 +3,31 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.2.0-preview1-17099 - 2.2.0-preview1-34755 - 2.2.0-preview1-34755 - 2.2.0-preview1-34755 - 2.2.0-preview1-34755 - 2.2.0-preview1-34755 - 2.2.0-preview1-34755 - 0.6.0-preview1-34755 - 2.2.0-preview1-34755 - 2.2.0-preview1-34755 + 2.2.0-preview1-17102 + 2.2.0-preview1-34823 + 2.2.0-preview1-34823 + 2.2.0-preview1-34823 + 2.2.0-preview1-34823 + 2.2.0-preview1-34823 + 2.2.0-preview1-34823 + 0.6.0-preview1-34823 + 2.2.0-preview1-34823 + 2.2.0-preview1-34823 15.6.82 - 2.2.0-preview1-34755 - 2.2.0-preview1-34755 - 2.2.0-preview1-34755 - 2.2.0-preview1-34755 - 2.2.0-preview1-34755 + 2.2.0-preview1-34823 + 2.2.0-preview1-34823 + 2.2.0-preview1-34823 + 2.2.0-preview1-34823 + 2.2.0-preview1-34823 2.0.9 2.1.2 2.2.0-preview1-26618-02 - 2.2.0-preview1-34755 + 2.2.0-preview1-34823 15.6.1 2.0.3 2.3.1 - 2.4.0-rc.1.build4038 + 2.4.0 + diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 27e2e80f9a..6b8da29e6b 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-17099 -commithash:263ed1db9866b6b419b1f5d5189a712aa218acb3 +version:2.2.0-preview1-17102 +commithash:e7e2b5a97ca92cfc6acc4def534cb0901a6d1eb9 From e094d2579e2982a7c69fb6418dfa4f04a3854f27 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Tue, 31 Jul 2018 11:06:30 -0700 Subject: [PATCH 26/42] Suppress obsolete warnings --- build/dependencies.props | 4 ++-- .../Internal/PrecompileRunCommand.cs | 2 ++ testapps/ApplicationWithConfigureMvc/Startup.cs | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 19a9ab159a..184016827b 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -6,8 +6,8 @@ 2.2.0-preview1-17102 2.2.0-preview1-34823 2.2.0-preview1-34823 - 2.2.0-preview1-34823 - 2.2.0-preview1-34823 + 2.2.0-a-preview1-obs-18917 + 2.2.0-a-preview1-obs-18917 2.2.0-preview1-34823 2.2.0-preview1-34823 0.6.0-preview1-34823 diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/PrecompileRunCommand.cs b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/PrecompileRunCommand.cs index 5c9b8a8a39..3203d8d39b 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/PrecompileRunCommand.cs +++ b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/PrecompileRunCommand.cs @@ -179,7 +179,9 @@ namespace Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Internal // Post process the compilation - run ExpressionRewritter and any user specified callbacks. compilation = ExpressionRewriter.Rewrite(compilation); var compilationContext = new RoslynCompilationContext(compilation); +#pragma warning disable CS0618 // Type or member is obsolete MvcServiceProvider.ViewEngineOptions.CompilationCallback(compilationContext); +#pragma warning restore CS0618 // Type or member is obsolete compilation = AssemblyMetadataGenerator.AddAssemblyMetadata( compiler, compilationContext.Compilation, diff --git a/testapps/ApplicationWithConfigureMvc/Startup.cs b/testapps/ApplicationWithConfigureMvc/Startup.cs index 19de8caa76..bad4439448 100644 --- a/testapps/ApplicationWithConfigureMvc/Startup.cs +++ b/testapps/ApplicationWithConfigureMvc/Startup.cs @@ -29,8 +29,10 @@ namespace ApplicationWithConfigureStartup { builder.AddRazorOptions(options => { +#pragma warning disable CS0618 // Type or member is obsolete var callback = options.CompilationCallback; options.CompilationCallback = context => +#pragma warning restore CS0618 // Type or member is obsolete { callback(context); foreach (var tree in context.Compilation.SyntaxTrees) From 72d7fc000a84c494793b2ffd3bfc825c699a312b Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 5 Aug 2018 19:23:16 +0000 Subject: [PATCH 27/42] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 32 ++++++++++++++++---------------- korebuild-lock.txt | 4 ++-- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 184016827b..e19f6783f8 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -3,26 +3,26 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.2.0-preview1-17102 - 2.2.0-preview1-34823 - 2.2.0-preview1-34823 - 2.2.0-a-preview1-obs-18917 - 2.2.0-a-preview1-obs-18917 - 2.2.0-preview1-34823 - 2.2.0-preview1-34823 - 0.6.0-preview1-34823 - 2.2.0-preview1-34823 - 2.2.0-preview1-34823 + 2.2.0-preview1-20180731.1 + 2.2.0-preview1-34882 + 2.2.0-preview1-34882 + 2.2.0-preview1-34882 + 2.2.0-preview1-34882 + 2.2.0-preview1-34882 + 2.2.0-preview1-34882 + 0.6.0-preview1-34882 + 2.2.0-preview1-34882 + 2.2.0-preview1-34882 15.6.82 - 2.2.0-preview1-34823 - 2.2.0-preview1-34823 - 2.2.0-preview1-34823 - 2.2.0-preview1-34823 - 2.2.0-preview1-34823 + 2.2.0-preview1-34882 + 2.2.0-preview1-34882 + 2.2.0-preview1-34882 + 2.2.0-preview1-34882 + 2.2.0-preview1-34882 2.0.9 2.1.2 2.2.0-preview1-26618-02 - 2.2.0-preview1-34823 + 2.2.0-preview1-34882 15.6.1 2.0.3 2.3.1 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 6b8da29e6b..c7af2292c7 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-17102 -commithash:e7e2b5a97ca92cfc6acc4def534cb0901a6d1eb9 +version:2.2.0-preview1-20180731.1 +commithash:29fde58465439f4bb9df40830635ed758e063daf From 63e17ca6732544804bc259ab8c58ece9b8187cf1 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Mon, 6 Aug 2018 20:47:01 +0000 Subject: [PATCH 28/42] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index e19f6783f8..db5b0bc08b 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,25 +4,25 @@ 2.2.0-preview1-20180731.1 - 2.2.0-preview1-34882 - 2.2.0-preview1-34882 - 2.2.0-preview1-34882 - 2.2.0-preview1-34882 - 2.2.0-preview1-34882 - 2.2.0-preview1-34882 - 0.6.0-preview1-34882 - 2.2.0-preview1-34882 - 2.2.0-preview1-34882 + 2.2.0-preview1-34896 + 2.2.0-preview1-34896 + 2.2.0-preview1-34896 + 2.2.0-preview1-34896 + 2.2.0-preview1-34896 + 2.2.0-preview1-34896 + 0.6.0-preview1-34896 + 2.2.0-preview1-34896 + 2.2.0-preview1-34896 15.6.82 - 2.2.0-preview1-34882 - 2.2.0-preview1-34882 - 2.2.0-preview1-34882 - 2.2.0-preview1-34882 - 2.2.0-preview1-34882 + 2.2.0-preview1-34896 + 2.2.0-preview1-34896 + 2.2.0-preview1-34896 + 2.2.0-preview1-34896 + 2.2.0-preview1-34896 2.0.9 2.1.2 2.2.0-preview1-26618-02 - 2.2.0-preview1-34882 + 2.2.0-preview1-34896 15.6.1 2.0.3 2.3.1 From 53ad62a3fa367067435714b6c7f948f648db6595 Mon Sep 17 00:00:00 2001 From: Pranav K Date: Tue, 7 Aug 2018 11:25:18 -0700 Subject: [PATCH 29/42] Remove Precompilation_WorksForViewsUsingDirectoryTraversal --- RazorViewCompilation.sln | 17 +---- ...plicationUsingRelativePathsTest_CoreCLR.cs | 60 ------------------ ...plicationUsingRelativePathsTest_Desktop.cs | 63 ------------------- test/FunctionalTests/FunctionalTests.csproj | 1 - .../ApplicationUsingRelativePaths.csproj | 16 ----- .../Controllers/HomeController.cs | 19 ------ .../ApplicationUsingRelativePaths/Program.cs | 26 -------- .../ApplicationUsingRelativePaths/Startup.cs | 21 ------- .../Views/Home/About.cshtml | 8 --- .../Views/Home/Index.cshtml | 6 -- .../Views/Shared/_Layout.cshtml | 6 -- .../Views/_ViewImports.cshtml | 2 - .../Views/_ViewStart.cshtml | 3 - 13 files changed, 1 insertion(+), 247 deletions(-) delete mode 100644 test/FunctionalTests/CoreCLRTests/ApplicationUsingRelativePathsTest_CoreCLR.cs delete mode 100644 test/FunctionalTests/DesktopTests/ApplicationUsingRelativePathsTest_Desktop.cs delete mode 100644 testapps/ApplicationUsingRelativePaths/ApplicationUsingRelativePaths.csproj delete mode 100644 testapps/ApplicationUsingRelativePaths/Controllers/HomeController.cs delete mode 100644 testapps/ApplicationUsingRelativePaths/Program.cs delete mode 100644 testapps/ApplicationUsingRelativePaths/Startup.cs delete mode 100644 testapps/ApplicationUsingRelativePaths/Views/Home/About.cshtml delete mode 100644 testapps/ApplicationUsingRelativePaths/Views/Home/Index.cshtml delete mode 100644 testapps/ApplicationUsingRelativePaths/Views/Shared/_Layout.cshtml delete mode 100644 testapps/ApplicationUsingRelativePaths/Views/_ViewImports.cshtml delete mode 100644 testapps/ApplicationUsingRelativePaths/Views/_ViewStart.cshtml diff --git a/RazorViewCompilation.sln b/RazorViewCompilation.sln index 3e35780944..83963166a3 100644 --- a/RazorViewCompilation.sln +++ b/RazorViewCompilation.sln @@ -1,4 +1,4 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 +Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.27130.2036 MinimumVisualStudioVersion = 15.0.26730.03 @@ -46,8 +46,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StrongNamedApp", "testapps\ 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}" @@ -177,18 +175,6 @@ Global {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 @@ -310,7 +296,6 @@ Global {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} diff --git a/test/FunctionalTests/CoreCLRTests/ApplicationUsingRelativePathsTest_CoreCLR.cs b/test/FunctionalTests/CoreCLRTests/ApplicationUsingRelativePathsTest_CoreCLR.cs deleted file mode 100644 index e115718137..0000000000 --- a/test/FunctionalTests/CoreCLRTests/ApplicationUsingRelativePathsTest_CoreCLR.cs +++ /dev/null @@ -1,60 +0,0 @@ -// 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.Threading.Tasks; -using Microsoft.Extensions.Logging.Testing; -using Xunit; -using Xunit.Abstractions; - -namespace FunctionalTests -{ - public class ApplicationUsingRelativePathsTest_CoreCLR : - LoggedTest, IClassFixture> - { - public ApplicationUsingRelativePathsTest_CoreCLR( - CoreCLRApplicationTestFixture fixture, - ITestOutputHelper output) - : base(output) - { - Fixture = fixture; - } - - public ApplicationTestFixture Fixture { get; } - - [Fact] - public async Task Precompilation_WorksForViewsUsingRelativePath() - { - using (StartLog(out var loggerFactory)) - { - // Arrange - var deployment = await Fixture.CreateDeploymentAsync(loggerFactory); - - // Act - var response = await deployment.HttpClient.GetStringWithRetryAsync( - deployment.ApplicationBaseUri, - loggerFactory.CreateLogger(Fixture.ApplicationName)); - - // Assert - TestEmbeddedResource.AssertContent("ApplicationUsingRelativePaths.Home.Index.txt", response); - } - } - - [Fact] - public async Task Precompilation_WorksForViewsUsingDirectoryTraversal() - { - using (StartLog(out var loggerFactory)) - { - // Arrange - var deployment = await Fixture.CreateDeploymentAsync(loggerFactory); - - // Act - var response = await deployment.HttpClient.GetStringWithRetryAsync( - deployment.ApplicationBaseUri, - loggerFactory.CreateLogger(Fixture.ApplicationName)); - - // Assert - TestEmbeddedResource.AssertContent("ApplicationUsingRelativePaths.Home.About.txt", response); - } - } - } -} diff --git a/test/FunctionalTests/DesktopTests/ApplicationUsingRelativePathsTest_Desktop.cs b/test/FunctionalTests/DesktopTests/ApplicationUsingRelativePathsTest_Desktop.cs deleted file mode 100644 index 4122fb7b65..0000000000 --- a/test/FunctionalTests/DesktopTests/ApplicationUsingRelativePathsTest_Desktop.cs +++ /dev/null @@ -1,63 +0,0 @@ -// 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.Threading.Tasks; -using Microsoft.AspNetCore.Testing.xunit; -using Microsoft.Extensions.Logging.Testing; -using Xunit; -using Xunit.Abstractions; - -namespace FunctionalTests -{ - [OSSkipCondition(OperatingSystems.Linux)] - [OSSkipCondition(OperatingSystems.MacOSX)] - public class ApplicationUsingRelativePathsTest_Desktop : - LoggedTest, IClassFixture> - { - public ApplicationUsingRelativePathsTest_Desktop( - DesktopApplicationTestFixture fixture, - ITestOutputHelper output) - : base(output) - { - Fixture = fixture; - } - - public ApplicationTestFixture Fixture { get; } - - [ConditionalFact] - public async Task Precompilation_WorksForViewsUsingRelativePath() - { - using (StartLog(out var loggerFactory)) - { - // Arrange - var deployment = await Fixture.CreateDeploymentAsync(loggerFactory); - - // Act - var response = await deployment.HttpClient.GetStringWithRetryAsync( - deployment.ApplicationBaseUri, - loggerFactory.CreateLogger(Fixture.ApplicationName)); - - // Assert - TestEmbeddedResource.AssertContent("ApplicationUsingRelativePaths.Home.Index.txt", response); - } - } - - [ConditionalFact] - public async Task Precompilation_WorksForViewsUsingDirectoryTraversal() - { - using (StartLog(out var loggerFactory)) - { - // Arrange - var deployment = await Fixture.CreateDeploymentAsync(loggerFactory); - - // Act - var response = await deployment.HttpClient.GetStringWithRetryAsync( - deployment.ApplicationBaseUri, - loggerFactory.CreateLogger(Fixture.ApplicationName)); - - // Assert - TestEmbeddedResource.AssertContent("ApplicationUsingRelativePaths.Home.About.txt", response); - } - } - } -} diff --git a/test/FunctionalTests/FunctionalTests.csproj b/test/FunctionalTests/FunctionalTests.csproj index 7a6a4d894b..5c8fa36506 100644 --- a/test/FunctionalTests/FunctionalTests.csproj +++ b/test/FunctionalTests/FunctionalTests.csproj @@ -34,7 +34,6 @@ - diff --git a/testapps/ApplicationUsingRelativePaths/ApplicationUsingRelativePaths.csproj b/testapps/ApplicationUsingRelativePaths/ApplicationUsingRelativePaths.csproj deleted file mode 100644 index 91b6481522..0000000000 --- a/testapps/ApplicationUsingRelativePaths/ApplicationUsingRelativePaths.csproj +++ /dev/null @@ -1,16 +0,0 @@ - - - - $(StandardTestAppTfms) - - true - - - - - - - - - - diff --git a/testapps/ApplicationUsingRelativePaths/Controllers/HomeController.cs b/testapps/ApplicationUsingRelativePaths/Controllers/HomeController.cs deleted file mode 100644 index 33ac0b1682..0000000000 --- a/testapps/ApplicationUsingRelativePaths/Controllers/HomeController.cs +++ /dev/null @@ -1,19 +0,0 @@ -using Microsoft.AspNetCore.Mvc; - -namespace ApplicationUsingRelativePaths.Controllers -{ - public class HomeController : Controller - { - public IActionResult Index() - { - return View("Views/Home/Index.cshtml"); - } - - public IActionResult About() - { - ViewData["Message"] = "Your application description page."; - - return View(); - } - } -} diff --git a/testapps/ApplicationUsingRelativePaths/Program.cs b/testapps/ApplicationUsingRelativePaths/Program.cs deleted file mode 100644 index 5d496db40e..0000000000 --- a/testapps/ApplicationUsingRelativePaths/Program.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System.IO; -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Configuration; - -namespace ApplicationUsingRelativePaths -{ - public class Program - { - public static void Main(string[] args) - { - var config = new ConfigurationBuilder() - .AddCommandLine(args) - .AddEnvironmentVariables(prefix: "ASPNETCORE_") - .Build(); - - var host = new WebHostBuilder() - .UseConfiguration(config) - .UseKestrel() - .UseContentRoot(Directory.GetCurrentDirectory()) - .UseStartup() - .Build(); - - host.Run(); - } - } -} diff --git a/testapps/ApplicationUsingRelativePaths/Startup.cs b/testapps/ApplicationUsingRelativePaths/Startup.cs deleted file mode 100644 index 9f7dbdf562..0000000000 --- a/testapps/ApplicationUsingRelativePaths/Startup.cs +++ /dev/null @@ -1,21 +0,0 @@ -using Microsoft.AspNetCore.Builder; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; - -namespace ApplicationUsingRelativePaths -{ - public class Startup - { - public void ConfigureServices(IServiceCollection services) - { - // Add framework services. - services.AddMvc(); - } - - public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) - { - loggerFactory.AddConsole(); - app.UseMvcWithDefaultRoute(); - } - } -} diff --git a/testapps/ApplicationUsingRelativePaths/Views/Home/About.cshtml b/testapps/ApplicationUsingRelativePaths/Views/Home/About.cshtml deleted file mode 100644 index bbc0672575..0000000000 --- a/testapps/ApplicationUsingRelativePaths/Views/Home/About.cshtml +++ /dev/null @@ -1,8 +0,0 @@ -@{ - Layout = "../Shared/_Layout.cshtml"; - ViewData["Title"] = "About"; -} -

@ViewData["Title"].

-

@ViewData["Message"]

- -

Use this area to provide additional information.

diff --git a/testapps/ApplicationUsingRelativePaths/Views/Home/Index.cshtml b/testapps/ApplicationUsingRelativePaths/Views/Home/Index.cshtml deleted file mode 100644 index b2bf7cf3d1..0000000000 --- a/testapps/ApplicationUsingRelativePaths/Views/Home/Index.cshtml +++ /dev/null @@ -1,6 +0,0 @@ -@{ - ViewData["Title"] = "Home Page"; -} - -@GetType().Assembly.FullName -Hello from Index! \ No newline at end of file diff --git a/testapps/ApplicationUsingRelativePaths/Views/Shared/_Layout.cshtml b/testapps/ApplicationUsingRelativePaths/Views/Shared/_Layout.cshtml deleted file mode 100644 index 4c909415a4..0000000000 --- a/testapps/ApplicationUsingRelativePaths/Views/Shared/_Layout.cshtml +++ /dev/null @@ -1,6 +0,0 @@ - - - - @RenderBody() - - \ No newline at end of file diff --git a/testapps/ApplicationUsingRelativePaths/Views/_ViewImports.cshtml b/testapps/ApplicationUsingRelativePaths/Views/_ViewImports.cshtml deleted file mode 100644 index 64245a9c34..0000000000 --- a/testapps/ApplicationUsingRelativePaths/Views/_ViewImports.cshtml +++ /dev/null @@ -1,2 +0,0 @@ -@using ApplicationUsingRelativePaths -@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers diff --git a/testapps/ApplicationUsingRelativePaths/Views/_ViewStart.cshtml b/testapps/ApplicationUsingRelativePaths/Views/_ViewStart.cshtml deleted file mode 100644 index 1b4f3a0748..0000000000 --- a/testapps/ApplicationUsingRelativePaths/Views/_ViewStart.cshtml +++ /dev/null @@ -1,3 +0,0 @@ -@{ - Layout = "Shared/_Layout.cshtml"; -} From a6f9e35e1e2e5da55a47e414e782a802d1b4c598 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 12 Aug 2018 19:25:02 +0000 Subject: [PATCH 30/42] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 32 ++++++++++++++++---------------- korebuild-lock.txt | 4 ++-- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index db5b0bc08b..6f9c2f9d40 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -3,26 +3,26 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.2.0-preview1-20180731.1 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 0.6.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 + 2.2.0-preview1-20180807.2 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 0.6.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 15.6.82 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 - 2.2.0-preview1-34896 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 + 2.2.0-preview1-34967 2.0.9 2.1.2 2.2.0-preview1-26618-02 - 2.2.0-preview1-34896 + 2.2.0-preview1-34967 15.6.1 2.0.3 2.3.1 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index c7af2292c7..3fbcc80189 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-20180731.1 -commithash:29fde58465439f4bb9df40830635ed758e063daf +version:2.2.0-preview1-20180807.2 +commithash:11495dbd236104434e08cb1152fcb58cf2a20923 From c35b2e6e8d61d8d5b49b0706d96e4738c7d4525f Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Tue, 21 Aug 2018 13:33:51 -0700 Subject: [PATCH 31/42] Update package branding for 2.2.0-preview2 --- build/dependencies.props | 2 +- version.props | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 6f9c2f9d40..a32de6a511 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -28,6 +28,6 @@ 2.3.1 2.4.0 - + diff --git a/version.props b/version.props index 44985cedb3..15637ba785 100644 --- a/version.props +++ b/version.props @@ -1,7 +1,7 @@ 2.2.0 - preview1 + preview2 $(VersionPrefix) $(VersionPrefix)-$(VersionSuffix)-final t000 From 50e71c4585fabc3bdbc874df770bc77274ca66a2 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 2 Sep 2018 12:22:53 -0700 Subject: [PATCH 32/42] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 32 ++++++++++++++++---------------- korebuild-lock.txt | 4 ++-- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index a32de6a511..078de63ca2 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -3,26 +3,26 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.2.0-preview1-20180807.2 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 0.6.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 + 2.2.0-preview1-20180821.1 + 2.2.0-preview2-35143 + 2.2.0-preview2-35143 + 2.2.0-preview2-35143 + 2.2.0-preview2-35143 + 2.2.0-preview2-35143 + 2.2.0-preview2-35143 + 0.6.0-preview2-35143 + 2.2.0-preview2-35143 + 2.2.0-preview2-35143 15.6.82 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 - 2.2.0-preview1-34967 + 2.2.0-preview2-35143 + 2.2.0-preview2-35143 + 2.2.0-preview2-35143 + 2.2.0-preview2-35143 + 2.2.0-preview2-35143 2.0.9 2.1.2 2.2.0-preview1-26618-02 - 2.2.0-preview1-34967 + 2.2.0-preview2-35143 15.6.1 2.0.3 2.3.1 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 3fbcc80189..ad704918df 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-20180807.2 -commithash:11495dbd236104434e08cb1152fcb58cf2a20923 +version:2.2.0-preview1-20180821.1 +commithash:c8d0cc52cd1abb697be24e288ffd54f8fae8bf17 From 77c2ab8595c0e75a2970da225a3e66247a4e80b2 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Wed, 5 Sep 2018 16:35:38 -0700 Subject: [PATCH 33/42] Update branding to 2.2.0-preview3 --- version.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.props b/version.props index 15637ba785..704cac087b 100644 --- a/version.props +++ b/version.props @@ -1,7 +1,7 @@ 2.2.0 - preview2 + preview3 $(VersionPrefix) $(VersionPrefix)-$(VersionSuffix)-final t000 From fee8961bcc9d942d8286a57a506ff0106c58728e Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 9 Sep 2018 12:25:22 -0700 Subject: [PATCH 34/42] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 36 ++++++++++++++++++------------------ korebuild-lock.txt | 4 ++-- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 078de63ca2..b9272ad188 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -3,26 +3,26 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.2.0-preview1-20180821.1 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 - 0.6.0-preview2-35143 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 + 2.2.0-preview1-20180907.8 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 + 0.6.0-preview3-35202 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 15.6.82 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 - 2.2.0-preview2-35143 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 + 2.2.0-preview3-35202 2.0.9 - 2.1.2 - 2.2.0-preview1-26618-02 - 2.2.0-preview2-35143 + 2.1.3 + 2.2.0-preview2-26905-02 + 2.2.0-preview3-35202 15.6.1 2.0.3 2.3.1 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index ad704918df..312f82f9a5 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-20180821.1 -commithash:c8d0cc52cd1abb697be24e288ffd54f8fae8bf17 +version:2.2.0-preview1-20180907.8 +commithash:078918eb5c1f176ee1da351c584fb4a4d7491aa0 From 7703802661b244f059e25472d88f8ef5a5705fd0 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 16 Sep 2018 12:23:52 -0700 Subject: [PATCH 35/42] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 32 ++++++++++++++++---------------- korebuild-lock.txt | 4 ++-- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index b9272ad188..5c66888d19 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -3,26 +3,26 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.2.0-preview1-20180907.8 - 2.2.0-preview3-35202 - 2.2.0-preview3-35202 - 2.2.0-preview3-35202 - 2.2.0-preview3-35202 - 2.2.0-preview3-35202 - 2.2.0-preview3-35202 - 0.6.0-preview3-35202 - 2.2.0-preview3-35202 - 2.2.0-preview3-35202 + 2.2.0-preview1-20180911.1 + 2.2.0-preview3-35252 + 2.2.0-preview3-35252 + 2.2.0-preview3-35252 + 2.2.0-preview3-35252 + 2.2.0-preview3-35252 + 2.2.0-preview3-35252 + 0.6.0-preview3-35252 + 2.2.0-preview3-35252 + 2.2.0-preview3-35252 15.6.82 - 2.2.0-preview3-35202 - 2.2.0-preview3-35202 - 2.2.0-preview3-35202 - 2.2.0-preview3-35202 - 2.2.0-preview3-35202 + 2.2.0-preview3-35252 + 2.2.0-preview3-35252 + 2.2.0-preview3-35252 + 2.2.0-preview3-35252 + 2.2.0-preview3-35252 2.0.9 2.1.3 2.2.0-preview2-26905-02 - 2.2.0-preview3-35202 + 2.2.0-preview3-35252 15.6.1 2.0.3 2.3.1 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 312f82f9a5..7124f37441 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-20180907.8 -commithash:078918eb5c1f176ee1da351c584fb4a4d7491aa0 +version:2.2.0-preview1-20180911.1 +commithash:ddfecdfc6e8e4859db5a0daea578070b862aac65 From 689e439b94941ba9a52c9b427e2a4eb5ab0b6fa3 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 23 Sep 2018 19:26:51 +0000 Subject: [PATCH 36/42] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 32 ++++++++++++++++---------------- korebuild-lock.txt | 4 ++-- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 5c66888d19..fac6f7479f 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -3,26 +3,26 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.2.0-preview1-20180911.1 - 2.2.0-preview3-35252 - 2.2.0-preview3-35252 - 2.2.0-preview3-35252 - 2.2.0-preview3-35252 - 2.2.0-preview3-35252 - 2.2.0-preview3-35252 - 0.6.0-preview3-35252 - 2.2.0-preview3-35252 - 2.2.0-preview3-35252 + 2.2.0-preview1-20180918.1 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 0.6.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 15.6.82 - 2.2.0-preview3-35252 - 2.2.0-preview3-35252 - 2.2.0-preview3-35252 - 2.2.0-preview3-35252 - 2.2.0-preview3-35252 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 + 2.2.0-preview3-35301 2.0.9 2.1.3 2.2.0-preview2-26905-02 - 2.2.0-preview3-35252 + 2.2.0-preview3-35301 15.6.1 2.0.3 2.3.1 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 7124f37441..649bf2ba0b 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-20180911.1 -commithash:ddfecdfc6e8e4859db5a0daea578070b862aac65 +version:2.2.0-preview1-20180918.1 +commithash:ad5e3fc53442741a0dd49bce437d2ac72f4b5800 From 47ae0c15cc550d30ed18e774830a1597200dea2a Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 28 Sep 2018 10:36:24 -0700 Subject: [PATCH 37/42] Fix microbuild signing configuration --- Directory.Build.props | 3 --- ...oft.AspNetCore.Mvc.Razor.ViewCompilation.csproj | 14 ++++++++++---- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index c7003b9eea..10676de560 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -14,9 +14,6 @@ $(MSBuildThisFileDirectory) $(MSBuildThisFileDirectory)build\Key.snk true - Microsoft - MicrosoftNuGet - true true diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.csproj b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.csproj index b9453e0891..9574c695d3 100644 --- a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.csproj +++ b/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.csproj @@ -22,11 +22,17 @@ + + + + + + + + + - - - - + From 794567b9461f932e7f86fafa0865a12b6fe22d55 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 28 Sep 2018 17:10:38 -0700 Subject: [PATCH 38/42] automated: bulk infrastructure updates. Update bootstrapper scripts and remove unnecessary signing properties --- run.ps1 | 6 +++--- run.sh | 10 +++++----- test/FunctionalTests/FunctionalTests.csproj | 1 - testapps/Directory.Build.props | 1 - testapps/StrongNamedApp/StrongNamedApp.csproj | 1 - 5 files changed, 8 insertions(+), 11 deletions(-) diff --git a/run.ps1 b/run.ps1 index 3b27382468..34604c7175 100644 --- a/run.ps1 +++ b/run.ps1 @@ -52,8 +52,8 @@ in the file are overridden by command line parameters. Example config file: ```json { - "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/dev/tools/korebuild.schema.json", - "channel": "dev", + "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/master/tools/korebuild.schema.json", + "channel": "master", "toolsSource": "https://aspnetcore.blob.core.windows.net/buildtools" } ``` @@ -192,7 +192,7 @@ if (!$DotNetHome) { else { Join-Path $PSScriptRoot '.dotnet'} } -if (!$Channel) { $Channel = 'dev' } +if (!$Channel) { $Channel = 'master' } if (!$ToolsSource) { $ToolsSource = 'https://aspnetcore.blob.core.windows.net/buildtools' } # Execute diff --git a/run.sh b/run.sh index 02aac15874..4c1fed5646 100755 --- a/run.sh +++ b/run.sh @@ -220,7 +220,7 @@ if [ -f "$config_file" ]; then config_channel="$(jq -r 'select(.channel!=null) | .channel' "$config_file")" config_tools_source="$(jq -r 'select(.toolsSource!=null) | .toolsSource' "$config_file")" else - _error "$config_file contains invalid JSON." + __error "$config_file contains invalid JSON." exit 1 fi elif __machine_has python ; then @@ -228,7 +228,7 @@ if [ -f "$config_file" ]; then config_channel="$(python -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['channel'] if 'channel' in obj else '')")" config_tools_source="$(python -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['toolsSource'] if 'toolsSource' in obj else '')")" else - _error "$config_file contains invalid JSON." + __error "$config_file contains invalid JSON." exit 1 fi elif __machine_has python3 ; then @@ -236,11 +236,11 @@ if [ -f "$config_file" ]; then config_channel="$(python3 -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['channel'] if 'channel' in obj else '')")" config_tools_source="$(python3 -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['toolsSource'] if 'toolsSource' in obj else '')")" else - _error "$config_file contains invalid JSON." + __error "$config_file contains invalid JSON." exit 1 fi else - _error 'Missing required command: jq or python. Could not parse the JSON file.' + __error 'Missing required command: jq or python. Could not parse the JSON file.' exit 1 fi @@ -248,7 +248,7 @@ if [ -f "$config_file" ]; then [ ! -z "${config_tools_source:-}" ] && tools_source="$config_tools_source" fi -[ -z "$channel" ] && channel='dev' +[ -z "$channel" ] && channel='master' [ -z "$tools_source" ] && tools_source='https://aspnetcore.blob.core.windows.net/buildtools' get_korebuild diff --git a/test/FunctionalTests/FunctionalTests.csproj b/test/FunctionalTests/FunctionalTests.csproj index 5c8fa36506..a0c5f23b91 100644 --- a/test/FunctionalTests/FunctionalTests.csproj +++ b/test/FunctionalTests/FunctionalTests.csproj @@ -6,7 +6,6 @@ $(DefineConstants);__remove_this_to__GENERATE_BASELINES $(DefineConstants);GENERATE_BASELINES false - false false win7-x64 diff --git a/testapps/Directory.Build.props b/testapps/Directory.Build.props index 4d776f550d..c8b985bfca 100644 --- a/testapps/Directory.Build.props +++ b/testapps/Directory.Build.props @@ -19,6 +19,5 @@ 1.0.0 false - false diff --git a/testapps/StrongNamedApp/StrongNamedApp.csproj b/testapps/StrongNamedApp/StrongNamedApp.csproj index b2d66d2953..f76a4cc9f4 100644 --- a/testapps/StrongNamedApp/StrongNamedApp.csproj +++ b/testapps/StrongNamedApp/StrongNamedApp.csproj @@ -3,7 +3,6 @@ $(StandardTestAppTfms) true - true true From 645ce09c1243ed25b78398bb610c65ca6303df19 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 30 Sep 2018 12:27:07 -0700 Subject: [PATCH 39/42] Update dependencies.props [auto-updated: dependencies] --- build/dependencies.props | 34 +++++++++++++++++----------------- korebuild-lock.txt | 4 ++-- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index fac6f7479f..73061aad9f 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -3,26 +3,26 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - 2.2.0-preview1-20180918.1 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 0.6.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 + 2.2.0-preview1-20180928.5 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 + 0.6.0-preview3-35359 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 15.6.82 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 - 2.2.0-preview3-35301 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 + 2.2.0-preview3-35359 2.0.9 2.1.3 - 2.2.0-preview2-26905-02 - 2.2.0-preview3-35301 + 2.2.0-preview3-26927-02 + 2.2.0-preview3-35359 15.6.1 2.0.3 2.3.1 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 649bf2ba0b..26697a21fa 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-20180918.1 -commithash:ad5e3fc53442741a0dd49bce437d2ac72f4b5800 +version:2.2.0-preview1-20180928.5 +commithash:43faa29f679f47b88689d645b39e6be5e0055d70 From f165f2c6d574bc3e65e4943998adb6c7b90330c6 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Tue, 16 Oct 2018 12:48:18 -0700 Subject: [PATCH 40/42] Update package branding for 2.2 RTM --- version.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.props b/version.props index 704cac087b..4889a26987 100644 --- a/version.props +++ b/version.props @@ -1,7 +1,7 @@ 2.2.0 - preview3 + rtm $(VersionPrefix) $(VersionPrefix)-$(VersionSuffix)-final t000 From f66b074402061b49cf4d88557542d23b1556cd09 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Tue, 6 Nov 2018 13:52:39 -0800 Subject: [PATCH 41/42] Remove obsolete logging API usage (#299) --- testapps/ApplicationWithConfigureMvc/Startup.cs | 2 +- testapps/ApplicationWithCustomInputFiles/Startup.cs | 2 +- testapps/ApplicationWithParseErrors/Startup.cs | 2 +- testapps/ApplicationWithRazorSdkNeitherUsed/Startup.cs | 2 +- testapps/ApplicationWithRazorSdkPrecompilationUsed/Startup.cs | 2 +- testapps/ApplicationWithRazorSdkUsed/Startup.cs | 2 +- testapps/ApplicationWithTagHelpers/Startup.cs | 2 +- testapps/PublishWithEmbedViewSources/Startup.cs | 2 +- testapps/RazorPagesApp/Startup.cs | 2 +- testapps/SimpleApp/Startup.cs | 2 +- testapps/SimpleAppWithAssemblyRename/Startup.cs | 2 +- testapps/StrongNamedApp/Startup.cs | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/testapps/ApplicationWithConfigureMvc/Startup.cs b/testapps/ApplicationWithConfigureMvc/Startup.cs index bad4439448..9c44e7a17d 100644 --- a/testapps/ApplicationWithConfigureMvc/Startup.cs +++ b/testapps/ApplicationWithConfigureMvc/Startup.cs @@ -9,6 +9,7 @@ namespace ApplicationWithConfigureStartup { public void ConfigureServices(IServiceCollection services) { + services.AddLogging(loggingBuilder => loggingBuilder.AddConsole()); // Add framework services. var builder = services.AddMvc(); ConfigureMvc(builder); @@ -16,7 +17,6 @@ namespace ApplicationWithConfigureStartup public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) { - loggerFactory.AddConsole(); app.UseMvc(routes => { routes.MapRoute( diff --git a/testapps/ApplicationWithCustomInputFiles/Startup.cs b/testapps/ApplicationWithCustomInputFiles/Startup.cs index d42b8dfad9..203395ded9 100644 --- a/testapps/ApplicationWithCustomInputFiles/Startup.cs +++ b/testapps/ApplicationWithCustomInputFiles/Startup.cs @@ -8,13 +8,13 @@ namespace ApplicationWithCustomInputFiles { public void ConfigureServices(IServiceCollection services) { + services.AddLogging(loggingBuilder => loggingBuilder.AddConsole()); // Add framework services. services.AddMvc(); } public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) { - loggerFactory.AddConsole(); app.UseMvc(routes => { routes.MapRoute( diff --git a/testapps/ApplicationWithParseErrors/Startup.cs b/testapps/ApplicationWithParseErrors/Startup.cs index b573e39a8c..8e2df21cc8 100644 --- a/testapps/ApplicationWithParseErrors/Startup.cs +++ b/testapps/ApplicationWithParseErrors/Startup.cs @@ -8,12 +8,12 @@ namespace ApplicationWithParseErrors { public void ConfigureServices(IServiceCollection services) { + services.AddLogging(loggingBuilder => loggingBuilder.AddConsole()); services.AddMvc(); } public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) { - loggerFactory.AddConsole(); app.UseMvcWithDefaultRoute(); } } diff --git a/testapps/ApplicationWithRazorSdkNeitherUsed/Startup.cs b/testapps/ApplicationWithRazorSdkNeitherUsed/Startup.cs index 4b06309f6d..c7068b7faa 100644 --- a/testapps/ApplicationWithRazorSdkNeitherUsed/Startup.cs +++ b/testapps/ApplicationWithRazorSdkNeitherUsed/Startup.cs @@ -8,13 +8,13 @@ namespace ApplicationWithRazorSdkNeitherUsed { public void ConfigureServices(IServiceCollection services) { + services.AddLogging(loggingBuilder => loggingBuilder.AddConsole()); // Add framework services. services.AddMvc(); } public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) { - loggerFactory.AddConsole(); app.UseMvcWithDefaultRoute(); } } diff --git a/testapps/ApplicationWithRazorSdkPrecompilationUsed/Startup.cs b/testapps/ApplicationWithRazorSdkPrecompilationUsed/Startup.cs index 16c835e52d..d168b9394c 100644 --- a/testapps/ApplicationWithRazorSdkPrecompilationUsed/Startup.cs +++ b/testapps/ApplicationWithRazorSdkPrecompilationUsed/Startup.cs @@ -8,13 +8,13 @@ namespace ApplicationWithRazorSdkPrecompilationUsed { public void ConfigureServices(IServiceCollection services) { + services.AddLogging(loggingBuilder => loggingBuilder.AddConsole()); // Add framework services. services.AddMvc(); } public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) { - loggerFactory.AddConsole(); app.UseMvcWithDefaultRoute(); } } diff --git a/testapps/ApplicationWithRazorSdkUsed/Startup.cs b/testapps/ApplicationWithRazorSdkUsed/Startup.cs index 8c6e88ed12..49a97f8e40 100644 --- a/testapps/ApplicationWithRazorSdkUsed/Startup.cs +++ b/testapps/ApplicationWithRazorSdkUsed/Startup.cs @@ -8,13 +8,13 @@ namespace ApplicationWithRazorSdkUsed { public void ConfigureServices(IServiceCollection services) { + services.AddLogging(loggingBuilder => loggingBuilder.AddConsole()); // Add framework services. services.AddMvc(); } public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) { - loggerFactory.AddConsole(); app.UseMvcWithDefaultRoute(); } } diff --git a/testapps/ApplicationWithTagHelpers/Startup.cs b/testapps/ApplicationWithTagHelpers/Startup.cs index 00a0fb6df9..48babe25f2 100644 --- a/testapps/ApplicationWithTagHelpers/Startup.cs +++ b/testapps/ApplicationWithTagHelpers/Startup.cs @@ -8,13 +8,13 @@ namespace ApplicationWithTagHelpers { public void ConfigureServices(IServiceCollection services) { + services.AddLogging(loggingBuilder => loggingBuilder.AddConsole()); // Add framework services. services.AddMvc(); } public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) { - loggerFactory.AddConsole(); app.UseMvc(routes => { routes.MapRoute( diff --git a/testapps/PublishWithEmbedViewSources/Startup.cs b/testapps/PublishWithEmbedViewSources/Startup.cs index c1e951b594..d7dee03fff 100644 --- a/testapps/PublishWithEmbedViewSources/Startup.cs +++ b/testapps/PublishWithEmbedViewSources/Startup.cs @@ -8,13 +8,13 @@ namespace PublishWithEmbedViewSources { public void ConfigureServices(IServiceCollection services) { + services.AddLogging(loggingBuilder => loggingBuilder.AddConsole()); // Add framework services. services.AddMvc(); } public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) { - loggerFactory.AddConsole(); app.UseMvc(routes => { routes.MapRoute( diff --git a/testapps/RazorPagesApp/Startup.cs b/testapps/RazorPagesApp/Startup.cs index 33964de1da..c90ccba906 100644 --- a/testapps/RazorPagesApp/Startup.cs +++ b/testapps/RazorPagesApp/Startup.cs @@ -10,6 +10,7 @@ namespace RazorPagesApp { public void ConfigureServices(IServiceCollection services) { + services.AddLogging(loggingBuilder => loggingBuilder.AddConsole()); var builder = services.AddMvc(); services.AddAuthentication(CookieAuthenticationDefaults.AuthenticationScheme).AddCookie(options => options.LoginPath = "/Login"); ConfigureMvc(builder); @@ -17,7 +18,6 @@ namespace RazorPagesApp public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) { - loggerFactory.AddConsole(); app.UseAuthentication(); app.UseMvc(); } diff --git a/testapps/SimpleApp/Startup.cs b/testapps/SimpleApp/Startup.cs index 461873a890..abf9ec6423 100644 --- a/testapps/SimpleApp/Startup.cs +++ b/testapps/SimpleApp/Startup.cs @@ -8,13 +8,13 @@ namespace SimpleApp { public void ConfigureServices(IServiceCollection services) { + services.AddLogging(loggingBuilder => loggingBuilder.AddConsole()); // Add framework services. services.AddMvc(); } public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) { - loggerFactory.AddConsole(); app.UseMvc(routes => { routes.MapRoute( diff --git a/testapps/SimpleAppWithAssemblyRename/Startup.cs b/testapps/SimpleAppWithAssemblyRename/Startup.cs index fa29d5b735..4492a3912b 100644 --- a/testapps/SimpleAppWithAssemblyRename/Startup.cs +++ b/testapps/SimpleAppWithAssemblyRename/Startup.cs @@ -8,13 +8,13 @@ namespace SimpleAppWithAssemblyRename { public void ConfigureServices(IServiceCollection services) { + services.AddLogging(loggingBuilder => loggingBuilder.AddConsole()); // Add framework services. services.AddMvc(); } public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) { - loggerFactory.AddConsole(); app.UseMvcWithDefaultRoute(); } } diff --git a/testapps/StrongNamedApp/Startup.cs b/testapps/StrongNamedApp/Startup.cs index a75f450846..f5dc4b4640 100644 --- a/testapps/StrongNamedApp/Startup.cs +++ b/testapps/StrongNamedApp/Startup.cs @@ -8,13 +8,13 @@ namespace StrongNamedApp { public void ConfigureServices(IServiceCollection services) { + services.AddLogging(loggingBuilder => loggingBuilder.AddConsole()); // Add framework services. services.AddMvc(); } public void Configure(IApplicationBuilder app, ILoggerFactory loggerFactory) { - loggerFactory.AddConsole(); app.UseMvc(routes => { routes.MapRoute( From 589db8b413f48c225234dca4b36bebe813423b23 Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Tue, 27 Nov 2018 12:12:19 -0800 Subject: [PATCH 42/42] Reorganize source code in preparation to move into aspnet/AspNetCore Prior to reorganization, this source code was found in https://github.com/aspnet/MvcPrecompilation/tree/032768b063a768559c8dfaea0d06380da77307ae --- .appveyor.yml | 17 -- .gitattributes | 52 ---- .github/ISSUE_TEMPALTE.md | 1 - .github/PULL_REQUEST_TEMPLATE.md | 1 - .travis.yml | 27 -- .vsts-pipelines/builds/ci-internal.yml | 13 - .vsts-pipelines/builds/ci-public.yml | 15 - CONTRIBUTING.md | 4 - LICENSE.txt | 14 - NuGet.config | 7 - build.cmd | 2 - build.sh | 8 - korebuild-lock.txt | 2 - korebuild.json | 4 - run.cmd | 2 - run.ps1 | 209 -------------- run.sh | 256 ------------------ .../MvcPrecompilation/.gitignore | 0 .../MvcPrecompilation/Directory.Build.props | 0 .../MvcPrecompilation/Directory.Build.targets | 0 .../NuGetPackageVerifier.json | 0 README.md => src/MvcPrecompilation/README.md | 0 .../RazorViewCompilation.sln | 0 .../MvcPrecompilation/build}/Key.snk | Bin .../build}/dependencies.props | 0 .../MvcPrecompilation/build}/repo.props | 0 .../MvcPrecompilation/build}/sources.props | 0 .../src}/Directory.Build.props | 0 .../GetDotNetHost.cs | 0 ...ore.Mvc.Razor.ViewCompilation.Tasks.csproj | 0 .../Internal/AssemblyMetadataGenerator.cs | 0 .../Internal/CompilationOptions.cs | 0 .../Internal/DebugHelper.cs | 0 .../Internal/MvcServiceProvider.cs | 0 .../Internal/PrecompilationApplication.cs | 0 .../Internal/PrecompileRunCommand.cs | 0 .../Internal/SnkUtils.cs | 0 .../Internal/ViewCompilationInfo.cs | 0 .../Internal/ViewFileInfo.cs | 0 ...spNetCore.Mvc.Razor.ViewCompilation.csproj | 0 ...spNetCore.Mvc.Razor.ViewCompilation.nuspec | 0 .../Program.cs | 0 .../Properties/AssemblyInfo.cs | 0 .../baseline.netcore.json | 0 ...pNetCore.Mvc.Razor.ViewCompilation.targets | 0 .../lib/net461/_._ | 0 .../lib/netcoreapp2.0/_._ | 0 .../test}/Directory.Build.props | 0 .../CoreCLRApplicationTestFixture.cs | 0 .../CoreCLRTests/SimpleAppTest_CoreCLR.cs | 0 .../DesktopApplicationTestFixture.cs | 0 .../DesktopTests/SimpleAppTest_Desktop.cs | 0 .../FunctionalTests/FunctionalTests.csproj | 0 .../Infrastructure/ApplicationPaths.cs | 0 .../Infrastructure/ApplicationTestFixture.cs | 0 .../Infrastructure/HttpClientExtensions.cs | 0 .../Infrastructure/PublishOnlyDeployer.cs | 0 .../Infrastructure/TestEmbeddedResource.cs | 0 .../Properties/AssemblyInfo.cs | 0 .../Resources/SimpleAppTest.Home.Index.txt | 0 ...Core.Mvc.Razor.ViewCompilation.Test.csproj | 0 .../PrecompileRunCommandTest.cs | 0 .../ApplicationWithConfigureMvc.csproj | 0 .../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 | 0 .../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 | 0 .../ApplicationWithParseErrors/Program.cs | 0 .../ApplicationWithParseErrors/Startup.cs | 0 .../Views/Home/About.cshtml | 0 .../Views/Home/Index.cshtml | 0 .../ApplicationWithRazorSdkNeitherUsed.csproj | 0 .../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 | 0 .../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 | 0 .../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 | 0 .../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 | 0 .../testapps}/Directory.Build.props | 0 .../testapps}/Directory.Build.targets | 0 .../Areas/TestArea/Views/Home/Index.cshtml | 0 .../Controllers/HomeController.cs | 0 .../PublishWithEmbedViewSources/Program.cs | 0 .../PublishWithEmbedViewSources.csproj | 0 .../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 .../testapps}/RazorPagesApp/Program.cs | 0 .../RazorPagesApp/RazorPagesApp.csproj | 0 .../testapps}/RazorPagesApp/Startup.cs | 0 .../RazorPagesApp/Views/Shared/_Layout.cshtml | 0 .../SimpleApp/Controllers/HomeController.cs | 0 .../testapps}/SimpleApp/Program.cs | 0 .../testapps}/SimpleApp/SimpleApp.csproj | 0 .../testapps}/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 | 0 .../SimpleAppWithAssemblyRename/Startup.cs | 0 .../Views/Home/Index.cshtml | 0 .../Views/_ViewImports.cshtml | 0 .../Controllers/HomeController.cs | 0 .../testapps}/StrongNamedApp/Program.cs | 0 .../testapps}/StrongNamedApp/Startup.cs | 0 .../StrongNamedApp/StrongNamedApp.csproj | 0 .../StrongNamedApp/Views/Home/Index.cshtml | 0 .../MvcPrecompilation/version.props | 0 166 files changed, 634 deletions(-) delete mode 100644 .appveyor.yml delete mode 100644 .gitattributes delete mode 100644 .github/ISSUE_TEMPALTE.md delete mode 100644 .github/PULL_REQUEST_TEMPLATE.md delete mode 100644 .travis.yml delete mode 100644 .vsts-pipelines/builds/ci-internal.yml delete mode 100644 .vsts-pipelines/builds/ci-public.yml delete mode 100644 CONTRIBUTING.md delete mode 100644 LICENSE.txt delete mode 100644 NuGet.config delete mode 100644 build.cmd delete mode 100755 build.sh delete mode 100644 korebuild-lock.txt delete mode 100644 korebuild.json delete mode 100644 run.cmd delete mode 100644 run.ps1 delete mode 100755 run.sh rename .gitignore => src/MvcPrecompilation/.gitignore (100%) rename Directory.Build.props => src/MvcPrecompilation/Directory.Build.props (100%) rename Directory.Build.targets => src/MvcPrecompilation/Directory.Build.targets (100%) rename NuGetPackageVerifier.json => src/MvcPrecompilation/NuGetPackageVerifier.json (100%) rename README.md => src/MvcPrecompilation/README.md (100%) rename RazorViewCompilation.sln => src/MvcPrecompilation/RazorViewCompilation.sln (100%) rename {build => src/MvcPrecompilation/build}/Key.snk (100%) rename {build => src/MvcPrecompilation/build}/dependencies.props (100%) rename {build => src/MvcPrecompilation/build}/repo.props (100%) rename {build => src/MvcPrecompilation/build}/sources.props (100%) rename src/{ => MvcPrecompilation/src}/Directory.Build.props (100%) rename src/{ => MvcPrecompilation/src}/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tasks/GetDotNetHost.cs (100%) rename src/{ => MvcPrecompilation/src}/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tasks/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tasks.csproj (100%) rename src/{ => MvcPrecompilation/src}/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/AssemblyMetadataGenerator.cs (100%) rename src/{ => MvcPrecompilation/src}/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/CompilationOptions.cs (100%) rename src/{ => MvcPrecompilation/src}/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/DebugHelper.cs (100%) rename src/{ => MvcPrecompilation/src}/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/MvcServiceProvider.cs (100%) rename src/{ => MvcPrecompilation/src}/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/PrecompilationApplication.cs (100%) rename src/{ => MvcPrecompilation/src}/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/PrecompileRunCommand.cs (100%) rename src/{ => MvcPrecompilation/src}/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/SnkUtils.cs (100%) rename src/{ => MvcPrecompilation/src}/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/ViewCompilationInfo.cs (100%) rename src/{ => MvcPrecompilation/src}/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/ViewFileInfo.cs (100%) rename src/{ => MvcPrecompilation/src}/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.csproj (100%) rename src/{ => MvcPrecompilation/src}/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.nuspec (100%) rename src/{ => MvcPrecompilation/src}/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Program.cs (100%) rename src/{ => MvcPrecompilation/src}/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Properties/AssemblyInfo.cs (100%) rename src/{ => MvcPrecompilation/src}/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/baseline.netcore.json (100%) rename src/{ => MvcPrecompilation/src}/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.targets (100%) rename src/{ => MvcPrecompilation/src}/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/lib/net461/_._ (100%) rename src/{ => MvcPrecompilation/src}/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/lib/netcoreapp2.0/_._ (100%) rename {test => src/MvcPrecompilation/test}/Directory.Build.props (100%) rename {test => src/MvcPrecompilation/test}/FunctionalTests/CoreCLRTests/CoreCLRApplicationTestFixture.cs (100%) rename {test => src/MvcPrecompilation/test}/FunctionalTests/CoreCLRTests/SimpleAppTest_CoreCLR.cs (100%) rename {test => src/MvcPrecompilation/test}/FunctionalTests/DesktopTests/DesktopApplicationTestFixture.cs (100%) rename {test => src/MvcPrecompilation/test}/FunctionalTests/DesktopTests/SimpleAppTest_Desktop.cs (100%) rename {test => src/MvcPrecompilation/test}/FunctionalTests/FunctionalTests.csproj (100%) rename {test => src/MvcPrecompilation/test}/FunctionalTests/Infrastructure/ApplicationPaths.cs (100%) rename {test => src/MvcPrecompilation/test}/FunctionalTests/Infrastructure/ApplicationTestFixture.cs (100%) rename {test => src/MvcPrecompilation/test}/FunctionalTests/Infrastructure/HttpClientExtensions.cs (100%) rename {test => src/MvcPrecompilation/test}/FunctionalTests/Infrastructure/PublishOnlyDeployer.cs (100%) rename {test => src/MvcPrecompilation/test}/FunctionalTests/Infrastructure/TestEmbeddedResource.cs (100%) rename {test => src/MvcPrecompilation/test}/FunctionalTests/Properties/AssemblyInfo.cs (100%) rename {test => src/MvcPrecompilation/test}/FunctionalTests/Resources/SimpleAppTest.Home.Index.txt (100%) rename {test => src/MvcPrecompilation/test}/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test.csproj (100%) rename {test => src/MvcPrecompilation/test}/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test/PrecompileRunCommandTest.cs (100%) rename {testapps => src/MvcPrecompilation/testapps}/ApplicationWithConfigureMvc/ApplicationWithConfigureMvc.csproj (100%) rename {testapps => src/MvcPrecompilation/testapps}/ApplicationWithConfigureMvc/Controllers/HomeController.cs (100%) rename {testapps => src/MvcPrecompilation/testapps}/ApplicationWithConfigureMvc/Program.cs (100%) rename {testapps => src/MvcPrecompilation/testapps}/ApplicationWithConfigureMvc/RazorRewriter.cs (100%) rename {testapps => src/MvcPrecompilation/testapps}/ApplicationWithConfigureMvc/Startup.cs (100%) rename {testapps => src/MvcPrecompilation/testapps}/ApplicationWithConfigureMvc/Views/Home/Index.cshtml (100%) rename {testapps => src/MvcPrecompilation/testapps}/ApplicationWithConfigureMvc/Views/Home/ViewWithPreprocessor.cshtml (100%) rename {testapps => src/MvcPrecompilation/testapps}/ApplicationWithCustomInputFiles/ApplicationWithCustomInputFiles.csproj (100%) rename {testapps => src/MvcPrecompilation/testapps}/ApplicationWithCustomInputFiles/Controllers/HomeController.cs (100%) rename {testapps => src/MvcPrecompilation/testapps}/ApplicationWithCustomInputFiles/Program.cs (100%) rename {testapps => src/MvcPrecompilation/testapps}/ApplicationWithCustomInputFiles/Startup.cs (100%) rename {testapps => src/MvcPrecompilation/testapps}/ApplicationWithCustomInputFiles/Views/Home/About.cshtml (100%) rename {testapps => src/MvcPrecompilation/testapps}/ApplicationWithCustomInputFiles/Views/Home/Index.cshtml (100%) rename {testapps => src/MvcPrecompilation/testapps}/ApplicationWithCustomInputFiles/Views/Home/NotIncluded.cshtml (100%) rename {testapps => src/MvcPrecompilation/testapps}/ApplicationWithParseErrors/ApplicationWithParseErrors.csproj (100%) rename {testapps => src/MvcPrecompilation/testapps}/ApplicationWithParseErrors/Program.cs (100%) rename {testapps => src/MvcPrecompilation/testapps}/ApplicationWithParseErrors/Startup.cs (100%) rename {testapps => src/MvcPrecompilation/testapps}/ApplicationWithParseErrors/Views/Home/About.cshtml (100%) rename {testapps => src/MvcPrecompilation/testapps}/ApplicationWithParseErrors/Views/Home/Index.cshtml (100%) rename {testapps => src/MvcPrecompilation/testapps}/ApplicationWithRazorSdkNeitherUsed/ApplicationWithRazorSdkNeitherUsed.csproj (100%) rename {testapps => src/MvcPrecompilation/testapps}/ApplicationWithRazorSdkNeitherUsed/Controllers/HomeController.cs (100%) rename {testapps => src/MvcPrecompilation/testapps}/ApplicationWithRazorSdkNeitherUsed/Program.cs (100%) rename {testapps => src/MvcPrecompilation/testapps}/ApplicationWithRazorSdkNeitherUsed/Startup.cs (100%) rename {testapps => src/MvcPrecompilation/testapps}/ApplicationWithRazorSdkNeitherUsed/Views/Home/About.cshtml (100%) rename {testapps => src/MvcPrecompilation/testapps}/ApplicationWithRazorSdkNeitherUsed/Views/Home/Index.cshtml (100%) rename {testapps => src/MvcPrecompilation/testapps}/ApplicationWithRazorSdkNeitherUsed/Views/Shared/_Layout.cshtml (100%) rename {testapps => src/MvcPrecompilation/testapps}/ApplicationWithRazorSdkNeitherUsed/Views/_ViewImports.cshtml (100%) rename {testapps => src/MvcPrecompilation/testapps}/ApplicationWithRazorSdkNeitherUsed/Views/_ViewStart.cshtml (100%) rename {testapps => src/MvcPrecompilation/testapps}/ApplicationWithRazorSdkPrecompilationUsed/ApplicationWithRazorSdkPrecompilationUsed.csproj (100%) rename {testapps => src/MvcPrecompilation/testapps}/ApplicationWithRazorSdkPrecompilationUsed/Controllers/HomeController.cs (100%) rename {testapps => src/MvcPrecompilation/testapps}/ApplicationWithRazorSdkPrecompilationUsed/Program.cs (100%) rename {testapps => src/MvcPrecompilation/testapps}/ApplicationWithRazorSdkPrecompilationUsed/Startup.cs (100%) rename {testapps => src/MvcPrecompilation/testapps}/ApplicationWithRazorSdkPrecompilationUsed/Views/Home/About.cshtml (100%) rename {testapps => src/MvcPrecompilation/testapps}/ApplicationWithRazorSdkPrecompilationUsed/Views/Home/Index.cshtml (100%) rename {testapps => src/MvcPrecompilation/testapps}/ApplicationWithRazorSdkPrecompilationUsed/Views/Shared/_Layout.cshtml (100%) rename {testapps => src/MvcPrecompilation/testapps}/ApplicationWithRazorSdkPrecompilationUsed/Views/_ViewImports.cshtml (100%) rename {testapps => src/MvcPrecompilation/testapps}/ApplicationWithRazorSdkPrecompilationUsed/Views/_ViewStart.cshtml (100%) rename {testapps => src/MvcPrecompilation/testapps}/ApplicationWithRazorSdkUsed/ApplicationWithRazorSdkUsed.csproj (100%) rename {testapps => src/MvcPrecompilation/testapps}/ApplicationWithRazorSdkUsed/Controllers/HomeController.cs (100%) rename {testapps => src/MvcPrecompilation/testapps}/ApplicationWithRazorSdkUsed/Program.cs (100%) rename {testapps => src/MvcPrecompilation/testapps}/ApplicationWithRazorSdkUsed/Startup.cs (100%) rename {testapps => src/MvcPrecompilation/testapps}/ApplicationWithRazorSdkUsed/Views/Home/About.cshtml (100%) rename {testapps => src/MvcPrecompilation/testapps}/ApplicationWithRazorSdkUsed/Views/Home/Index.cshtml (100%) rename {testapps => src/MvcPrecompilation/testapps}/ApplicationWithRazorSdkUsed/Views/Shared/_Layout.cshtml (100%) rename {testapps => src/MvcPrecompilation/testapps}/ApplicationWithRazorSdkUsed/Views/_ViewImports.cshtml (100%) rename {testapps => src/MvcPrecompilation/testapps}/ApplicationWithRazorSdkUsed/Views/_ViewStart.cshtml (100%) rename {testapps => src/MvcPrecompilation/testapps}/ApplicationWithTagHelpers/ApplicationWithTagHelpers.csproj (100%) rename {testapps => src/MvcPrecompilation/testapps}/ApplicationWithTagHelpers/Components/CopyrightViewComponent.cs (100%) rename {testapps => src/MvcPrecompilation/testapps}/ApplicationWithTagHelpers/Controllers/HomeController.cs (100%) rename {testapps => src/MvcPrecompilation/testapps}/ApplicationWithTagHelpers/Program.cs (100%) rename {testapps => src/MvcPrecompilation/testapps}/ApplicationWithTagHelpers/Startup.cs (100%) rename {testapps => src/MvcPrecompilation/testapps}/ApplicationWithTagHelpers/TagHelpers/TestTagHelper.cs (100%) rename {testapps => src/MvcPrecompilation/testapps}/ApplicationWithTagHelpers/Views/Home/ClassLibraryTagHelper.cshtml (100%) rename {testapps => src/MvcPrecompilation/testapps}/ApplicationWithTagHelpers/Views/Home/LocalTagHelper.cshtml (100%) rename {testapps => src/MvcPrecompilation/testapps}/ApplicationWithTagHelpers/Views/Shared/Components/Copyright/Default.cshtml (100%) rename {testapps => src/MvcPrecompilation/testapps}/ApplicationWithTagHelpers/Views/Shared/_Layout.cshtml (100%) rename {testapps => src/MvcPrecompilation/testapps}/ApplicationWithTagHelpers/Views/_ViewImports.cshtml (100%) rename {testapps => src/MvcPrecompilation/testapps}/ApplicationWithTagHelpers/Views/_ViewStart.cshtml (100%) rename {testapps => src/MvcPrecompilation/testapps}/ClassLibraryTagHelper/BoldTagHelper.cs (100%) rename {testapps => src/MvcPrecompilation/testapps}/ClassLibraryTagHelper/ClassLibraryTagHelper.csproj (100%) rename {testapps => src/MvcPrecompilation/testapps}/Directory.Build.props (100%) rename {testapps => src/MvcPrecompilation/testapps}/Directory.Build.targets (100%) rename {testapps => src/MvcPrecompilation/testapps}/PublishWithEmbedViewSources/Areas/TestArea/Views/Home/Index.cshtml (100%) rename {testapps => src/MvcPrecompilation/testapps}/PublishWithEmbedViewSources/Controllers/HomeController.cs (100%) rename {testapps => src/MvcPrecompilation/testapps}/PublishWithEmbedViewSources/Program.cs (100%) rename {testapps => src/MvcPrecompilation/testapps}/PublishWithEmbedViewSources/PublishWithEmbedViewSources.csproj (100%) rename {testapps => src/MvcPrecompilation/testapps}/PublishWithEmbedViewSources/Startup.cs (100%) rename {testapps => src/MvcPrecompilation/testapps}/PublishWithEmbedViewSources/Views/Home/About.cshtml (100%) rename {testapps => src/MvcPrecompilation/testapps}/PublishWithEmbedViewSources/Views/Home/Index.cshtml (100%) rename {testapps => src/MvcPrecompilation/testapps}/RazorPagesApp/Pages/Auth/Index.cshtml (100%) rename {testapps => src/MvcPrecompilation/testapps}/RazorPagesApp/Pages/Index.cshtml (100%) rename {testapps => src/MvcPrecompilation/testapps}/RazorPagesApp/Pages/Login.cshtml (100%) rename {testapps => src/MvcPrecompilation/testapps}/RazorPagesApp/Pages/MyPageModel.cs (100%) rename {testapps => src/MvcPrecompilation/testapps}/RazorPagesApp/Pages/Nested1/Nested2/PageWithTagHelper.cshtml (100%) rename {testapps => src/MvcPrecompilation/testapps}/RazorPagesApp/Pages/Nested1/_ViewImports.cshtml (100%) rename {testapps => src/MvcPrecompilation/testapps}/RazorPagesApp/Pages/PageWithModel.cshtml (100%) rename {testapps => src/MvcPrecompilation/testapps}/RazorPagesApp/Pages/PageWithRoute.cshtml (100%) rename {testapps => src/MvcPrecompilation/testapps}/RazorPagesApp/Pages/_PageStart.cshtml (100%) rename {testapps => src/MvcPrecompilation/testapps}/RazorPagesApp/Pages/_ViewImports.cshtml (100%) rename {testapps => src/MvcPrecompilation/testapps}/RazorPagesApp/Program.cs (100%) rename {testapps => src/MvcPrecompilation/testapps}/RazorPagesApp/RazorPagesApp.csproj (100%) rename {testapps => src/MvcPrecompilation/testapps}/RazorPagesApp/Startup.cs (100%) rename {testapps => src/MvcPrecompilation/testapps}/RazorPagesApp/Views/Shared/_Layout.cshtml (100%) rename {testapps => src/MvcPrecompilation/testapps}/SimpleApp/Controllers/HomeController.cs (100%) rename {testapps => src/MvcPrecompilation/testapps}/SimpleApp/Program.cs (100%) rename {testapps => src/MvcPrecompilation/testapps}/SimpleApp/SimpleApp.csproj (100%) rename {testapps => src/MvcPrecompilation/testapps}/SimpleApp/Startup.cs (100%) rename {testapps => src/MvcPrecompilation/testapps}/SimpleApp/Views/Home/About.cshtml (100%) rename {testapps => src/MvcPrecompilation/testapps}/SimpleApp/Views/Home/Index.cshtml (100%) rename {testapps => src/MvcPrecompilation/testapps}/SimpleApp/Views/Shared/_Layout.cshtml (100%) rename {testapps => src/MvcPrecompilation/testapps}/SimpleApp/Views/_ViewImports.cshtml (100%) rename {testapps => src/MvcPrecompilation/testapps}/SimpleApp/Views/_ViewStart.cshtml (100%) rename {testapps => src/MvcPrecompilation/testapps}/SimpleAppWithAssemblyRename/Controllers/HomeController.cs (100%) rename {testapps => src/MvcPrecompilation/testapps}/SimpleAppWithAssemblyRename/Program.cs (100%) rename {testapps => src/MvcPrecompilation/testapps}/SimpleAppWithAssemblyRename/SimpleAppWithAssemblyRename.csproj (100%) rename {testapps => src/MvcPrecompilation/testapps}/SimpleAppWithAssemblyRename/Startup.cs (100%) rename {testapps => src/MvcPrecompilation/testapps}/SimpleAppWithAssemblyRename/Views/Home/Index.cshtml (100%) rename {testapps => src/MvcPrecompilation/testapps}/SimpleAppWithAssemblyRename/Views/_ViewImports.cshtml (100%) rename {testapps => src/MvcPrecompilation/testapps}/StrongNamedApp/Controllers/HomeController.cs (100%) rename {testapps => src/MvcPrecompilation/testapps}/StrongNamedApp/Program.cs (100%) rename {testapps => src/MvcPrecompilation/testapps}/StrongNamedApp/Startup.cs (100%) rename {testapps => src/MvcPrecompilation/testapps}/StrongNamedApp/StrongNamedApp.csproj (100%) rename {testapps => src/MvcPrecompilation/testapps}/StrongNamedApp/Views/Home/Index.cshtml (100%) rename version.props => src/MvcPrecompilation/version.props (100%) diff --git a/.appveyor.yml b/.appveyor.yml deleted file mode 100644 index 4eea96ab69..0000000000 --- a/.appveyor.yml +++ /dev/null @@ -1,17 +0,0 @@ -init: -- git config --global core.autocrlf true -branches: - only: - - dev - - /^release\/.*$/ - - /^(.*\/)?ci-.*$/ -build_script: -- ps: .\run.ps1 default-build -clone_depth: 1 -environment: - global: - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true - DOTNET_CLI_TELEMETRY_OPTOUT: 1 -test: 'off' -deploy: 'off' -os: Visual Studio 2017 diff --git a/.gitattributes b/.gitattributes deleted file mode 100644 index d4ee1cb7f3..0000000000 --- a/.gitattributes +++ /dev/null @@ -1,52 +0,0 @@ -*.doc diff=astextplain -*.DOC diff=astextplain -*.docx diff=astextplain -*.DOCX diff=astextplain -*.dot diff=astextplain -*.DOT diff=astextplain -*.pdf diff=astextplain -*.PDF diff=astextplain -*.rtf diff=astextplain -*.RTF diff=astextplain - -*.jpg binary -*.png binary -*.gif binary - -*.cs text=auto diff=csharp -*.vb text=auto -*.resx text=auto -*.c text=auto -*.cpp text=auto -*.cxx text=auto -*.h text=auto -*.hxx text=auto -*.py text=auto -*.rb text=auto -*.java text=auto -*.html text=auto -*.htm text=auto -*.css text=auto -*.scss text=auto -*.sass text=auto -*.less text=auto -*.js text=auto -*.lisp text=auto -*.clj text=auto -*.sql text=auto -*.php text=auto -*.lua text=auto -*.m text=auto -*.asm text=auto -*.erl text=auto -*.fs text=auto -*.fsx text=auto -*.hs text=auto - -*.csproj text=auto -*.vbproj text=auto -*.fsproj text=auto -*.dbproj text=auto -*.sln text=auto eol=crlf - -*.sh eol=lf diff --git a/.github/ISSUE_TEMPALTE.md b/.github/ISSUE_TEMPALTE.md deleted file mode 100644 index 37655ead71..0000000000 --- a/.github/ISSUE_TEMPALTE.md +++ /dev/null @@ -1 +0,0 @@ -NOTE: This repo is solely for maintenance of the existing MVC precompilation feature. Future work on Razor compilation is now being handled in the [Razor](https://github.com/aspnet/razor) repo. See [aspnet/Razor#1740](https://github.com/aspnet/Razor/issues/1740) for additional details. diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md deleted file mode 100644 index 37655ead71..0000000000 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ /dev/null @@ -1 +0,0 @@ -NOTE: This repo is solely for maintenance of the existing MVC precompilation feature. Future work on Razor compilation is now being handled in the [Razor](https://github.com/aspnet/razor) repo. See [aspnet/Razor#1740](https://github.com/aspnet/Razor/issues/1740) for additional details. diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 64bdbb4441..0000000000 --- a/.travis.yml +++ /dev/null @@ -1,27 +0,0 @@ -language: csharp -sudo: false -dist: trusty -env: - global: - - DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true - - DOTNET_CLI_TELEMETRY_OPTOUT: 1 -mono: none -os: -- linux -- osx -osx_image: xcode8.2 -addons: - apt: - packages: - - libunwind8 -branches: - only: - - dev - - /^release\/.*$/ - - /^(.*\/)?ci-.*$/ -before_install: -- if test "$TRAVIS_OS_NAME" == "osx"; then brew update; brew install openssl; ln -s - /usr/local/opt/openssl/lib/libcrypto.1.0.0.dylib /usr/local/lib/; ln -s /usr/local/opt/openssl/lib/libssl.1.0.0.dylib - /usr/local/lib/; fi -script: -- ./build.sh diff --git a/.vsts-pipelines/builds/ci-internal.yml b/.vsts-pipelines/builds/ci-internal.yml deleted file mode 100644 index dc7b8a3cb9..0000000000 --- a/.vsts-pipelines/builds/ci-internal.yml +++ /dev/null @@ -1,13 +0,0 @@ -trigger: -- master -- release/* - -resources: - repositories: - - repository: buildtools - type: git - name: aspnet-BuildTools - ref: refs/heads/release/2.2 - -phases: -- template: .vsts-pipelines/templates/project-ci.yml@buildtools diff --git a/.vsts-pipelines/builds/ci-public.yml b/.vsts-pipelines/builds/ci-public.yml deleted file mode 100644 index f5087d9c30..0000000000 --- a/.vsts-pipelines/builds/ci-public.yml +++ /dev/null @@ -1,15 +0,0 @@ -trigger: -- master -- release/* - -# See https://github.com/aspnet/BuildTools -resources: - repositories: - - repository: buildtools - type: github - endpoint: DotNet-Bot GitHub Connection - name: aspnet/BuildTools - ref: refs/heads/release/2.2 - -phases: -- template: .vsts-pipelines/templates/project-ci.yml@buildtools diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md deleted file mode 100644 index 64ff041d5c..0000000000 --- a/CONTRIBUTING.md +++ /dev/null @@ -1,4 +0,0 @@ -Contributing -====== - -Information on contributing to this repo is in the [Contributing Guide](https://github.com/aspnet/Home/blob/dev/CONTRIBUTING.md) in the Home repo. diff --git a/LICENSE.txt b/LICENSE.txt deleted file mode 100644 index 7b2956ecee..0000000000 --- a/LICENSE.txt +++ /dev/null @@ -1,14 +0,0 @@ -Copyright (c) .NET Foundation and Contributors - -All rights reserved. - -Licensed under the Apache License, Version 2.0 (the "License"); you may not use -this file except in compliance with the License. You may obtain a copy of the -License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software distributed -under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -CONDITIONS OF ANY KIND, either express or implied. See the License for the -specific language governing permissions and limitations under the License. diff --git a/NuGet.config b/NuGet.config deleted file mode 100644 index e32bddfd51..0000000000 --- a/NuGet.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/build.cmd b/build.cmd deleted file mode 100644 index c0050bda12..0000000000 --- a/build.cmd +++ /dev/null @@ -1,2 +0,0 @@ -@ECHO OFF -PowerShell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command "[System.Threading.Thread]::CurrentThread.CurrentCulture = ''; [System.Threading.Thread]::CurrentThread.CurrentUICulture = '';& '%~dp0run.ps1' default-build %*; exit $LASTEXITCODE" diff --git a/build.sh b/build.sh deleted file mode 100755 index 98a4b22765..0000000000 --- a/build.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -set -euo pipefail -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" - -# Call "sync" between "chmod" and execution to prevent "text file busy" error in Docker (aufs) -chmod +x "$DIR/run.sh"; sync -"$DIR/run.sh" default-build "$@" diff --git a/korebuild-lock.txt b/korebuild-lock.txt deleted file mode 100644 index 26697a21fa..0000000000 --- a/korebuild-lock.txt +++ /dev/null @@ -1,2 +0,0 @@ -version:2.2.0-preview1-20180928.5 -commithash:43faa29f679f47b88689d645b39e6be5e0055d70 diff --git a/korebuild.json b/korebuild.json deleted file mode 100644 index d217d06e3e..0000000000 --- a/korebuild.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/release/2.2/tools/korebuild.schema.json", - "channel": "release/2.2" -} diff --git a/run.cmd b/run.cmd deleted file mode 100644 index d52d5c7e68..0000000000 --- a/run.cmd +++ /dev/null @@ -1,2 +0,0 @@ -@ECHO OFF -PowerShell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command "[System.Threading.Thread]::CurrentThread.CurrentCulture = ''; [System.Threading.Thread]::CurrentThread.CurrentUICulture = '';& '%~dp0run.ps1' %*; exit $LASTEXITCODE" diff --git a/run.ps1 b/run.ps1 deleted file mode 100644 index 34604c7175..0000000000 --- a/run.ps1 +++ /dev/null @@ -1,209 +0,0 @@ -#!/usr/bin/env powershell -#requires -version 4 - -<# -.SYNOPSIS -Executes KoreBuild commands. - -.DESCRIPTION -Downloads korebuild if required. Then executes the KoreBuild command. To see available commands, execute with `-Command help`. - -.PARAMETER Command -The KoreBuild command to run. - -.PARAMETER Path -The folder to build. Defaults to the folder containing this script. - -.PARAMETER Channel -The channel of KoreBuild to download. Overrides the value from the config file. - -.PARAMETER DotNetHome -The directory where .NET Core tools will be stored. - -.PARAMETER ToolsSource -The base url where build tools can be downloaded. Overrides the value from the config file. - -.PARAMETER Update -Updates KoreBuild to the latest version even if a lock file is present. - -.PARAMETER Reinstall -Re-installs KoreBuild - -.PARAMETER ConfigFile -The path to the configuration file that stores values. Defaults to korebuild.json. - -.PARAMETER ToolsSourceSuffix -The Suffix to append to the end of the ToolsSource. Useful for query strings in blob stores. - -.PARAMETER CI -Sets up CI specific settings and variables. - -.PARAMETER Arguments -Arguments to be passed to the command - -.NOTES -This function will create a file $PSScriptRoot/korebuild-lock.txt. This lock file can be committed to source, but does not have to be. -When the lockfile is not present, KoreBuild will create one using latest available version from $Channel. - -The $ConfigFile is expected to be an JSON file. It is optional, and the configuration values in it are optional as well. Any options set -in the file are overridden by command line parameters. - -.EXAMPLE -Example config file: -```json -{ - "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/master/tools/korebuild.schema.json", - "channel": "master", - "toolsSource": "https://aspnetcore.blob.core.windows.net/buildtools" -} -``` -#> -[CmdletBinding(PositionalBinding = $false)] -param( - [Parameter(Mandatory = $true, Position = 0)] - [string]$Command, - [string]$Path = $PSScriptRoot, - [Alias('c')] - [string]$Channel, - [Alias('d')] - [string]$DotNetHome, - [Alias('s')] - [string]$ToolsSource, - [Alias('u')] - [switch]$Update, - [switch]$Reinstall, - [string]$ToolsSourceSuffix, - [string]$ConfigFile = $null, - [switch]$CI, - [Parameter(ValueFromRemainingArguments = $true)] - [string[]]$Arguments -) - -Set-StrictMode -Version 2 -$ErrorActionPreference = 'Stop' - -# -# Functions -# - -function Get-KoreBuild { - - $lockFile = Join-Path $Path 'korebuild-lock.txt' - - if (!(Test-Path $lockFile) -or $Update) { - Get-RemoteFile "$ToolsSource/korebuild/channels/$Channel/latest.txt" $lockFile $ToolsSourceSuffix - } - - $version = Get-Content $lockFile | Where-Object { $_ -like 'version:*' } | Select-Object -first 1 - if (!$version) { - Write-Error "Failed to parse version from $lockFile. Expected a line that begins with 'version:'" - } - $version = $version.TrimStart('version:').Trim() - $korebuildPath = Join-Paths $DotNetHome ('buildtools', 'korebuild', $version) - - if ($Reinstall -and (Test-Path $korebuildPath)) { - Remove-Item -Force -Recurse $korebuildPath - } - - if (!(Test-Path $korebuildPath)) { - Write-Host -ForegroundColor Magenta "Downloading KoreBuild $version" - New-Item -ItemType Directory -Path $korebuildPath | Out-Null - $remotePath = "$ToolsSource/korebuild/artifacts/$version/korebuild.$version.zip" - - try { - $tmpfile = Join-Path ([IO.Path]::GetTempPath()) "KoreBuild-$([guid]::NewGuid()).zip" - Get-RemoteFile $remotePath $tmpfile $ToolsSourceSuffix - if (Get-Command -Name 'Microsoft.PowerShell.Archive\Expand-Archive' -ErrorAction Ignore) { - # Use built-in commands where possible as they are cross-plat compatible - Microsoft.PowerShell.Archive\Expand-Archive -Path $tmpfile -DestinationPath $korebuildPath - } - else { - # Fallback to old approach for old installations of PowerShell - Add-Type -AssemblyName System.IO.Compression.FileSystem - [System.IO.Compression.ZipFile]::ExtractToDirectory($tmpfile, $korebuildPath) - } - } - catch { - Remove-Item -Recurse -Force $korebuildPath -ErrorAction Ignore - throw - } - finally { - Remove-Item $tmpfile -ErrorAction Ignore - } - } - - return $korebuildPath -} - -function Join-Paths([string]$path, [string[]]$childPaths) { - $childPaths | ForEach-Object { $path = Join-Path $path $_ } - return $path -} - -function Get-RemoteFile([string]$RemotePath, [string]$LocalPath, [string]$RemoteSuffix) { - if ($RemotePath -notlike 'http*') { - Copy-Item $RemotePath $LocalPath - return - } - - $retries = 10 - while ($retries -gt 0) { - $retries -= 1 - try { - Invoke-WebRequest -UseBasicParsing -Uri $($RemotePath + $RemoteSuffix) -OutFile $LocalPath - return - } - catch { - Write-Verbose "Request failed. $retries retries remaining" - } - } - - Write-Error "Download failed: '$RemotePath'." -} - -# -# Main -# - -# Load configuration or set defaults - -$Path = Resolve-Path $Path -if (!$ConfigFile) { $ConfigFile = Join-Path $Path 'korebuild.json' } - -if (Test-Path $ConfigFile) { - try { - $config = Get-Content -Raw -Encoding UTF8 -Path $ConfigFile | ConvertFrom-Json - if ($config) { - if (!($Channel) -and (Get-Member -Name 'channel' -InputObject $config)) { [string] $Channel = $config.channel } - if (!($ToolsSource) -and (Get-Member -Name 'toolsSource' -InputObject $config)) { [string] $ToolsSource = $config.toolsSource} - } - } - catch { - Write-Host -ForegroundColor Red $Error[0] - Write-Error "$ConfigFile contains invalid JSON." - exit 1 - } -} - -if (!$DotNetHome) { - $DotNetHome = if ($env:DOTNET_HOME) { $env:DOTNET_HOME } ` - elseif ($env:USERPROFILE) { Join-Path $env:USERPROFILE '.dotnet'} ` - elseif ($env:HOME) {Join-Path $env:HOME '.dotnet'}` - else { Join-Path $PSScriptRoot '.dotnet'} -} - -if (!$Channel) { $Channel = 'master' } -if (!$ToolsSource) { $ToolsSource = 'https://aspnetcore.blob.core.windows.net/buildtools' } - -# Execute - -$korebuildPath = Get-KoreBuild -Import-Module -Force -Scope Local (Join-Path $korebuildPath 'KoreBuild.psd1') - -try { - Set-KoreBuildSettings -ToolsSource $ToolsSource -DotNetHome $DotNetHome -RepoPath $Path -ConfigFile $ConfigFile -CI:$CI - Invoke-KoreBuildCommand $Command @Arguments -} -finally { - Remove-Module 'KoreBuild' -ErrorAction Ignore -} diff --git a/run.sh b/run.sh deleted file mode 100755 index 4c1fed5646..0000000000 --- a/run.sh +++ /dev/null @@ -1,256 +0,0 @@ -#!/usr/bin/env bash - -set -euo pipefail - -# -# variables -# - -RESET="\033[0m" -RED="\033[0;31m" -YELLOW="\033[0;33m" -MAGENTA="\033[0;95m" -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -[ -z "${DOTNET_HOME:-}" ] && DOTNET_HOME="$HOME/.dotnet" -verbose=false -update=false -reinstall=false -repo_path="$DIR" -channel='' -tools_source='' -tools_source_suffix='' -ci=false - -# -# Functions -# -__usage() { - echo "Usage: $(basename "${BASH_SOURCE[0]}") command [options] [[--] ...]" - echo "" - echo "Arguments:" - echo " command The command to be run." - echo " ... Arguments passed to the command. Variable number of arguments allowed." - echo "" - echo "Options:" - echo " --verbose Show verbose output." - echo " -c|--channel The channel of KoreBuild to download. Overrides the value from the config file.." - echo " --config-file The path to the configuration file that stores values. Defaults to korebuild.json." - echo " -d|--dotnet-home The directory where .NET Core tools will be stored. Defaults to '\$DOTNET_HOME' or '\$HOME/.dotnet." - echo " --path The directory to build. Defaults to the directory containing the script." - echo " -s|--tools-source|-ToolsSource The base url where build tools can be downloaded. Overrides the value from the config file." - echo " --tools-source-suffix|-ToolsSourceSuffix The suffix to append to tools-source. Useful for query strings." - echo " -u|--update Update to the latest KoreBuild even if the lock file is present." - echo " --reinstall Reinstall KoreBuild." - echo " --ci Apply CI specific settings and environment variables." - echo "" - echo "Description:" - echo " This function will create a file \$DIR/korebuild-lock.txt. This lock file can be committed to source, but does not have to be." - echo " When the lockfile is not present, KoreBuild will create one using latest available version from \$channel." - - if [[ "${1:-}" != '--no-exit' ]]; then - exit 2 - fi -} - -get_korebuild() { - local version - local lock_file="$repo_path/korebuild-lock.txt" - if [ ! -f "$lock_file" ] || [ "$update" = true ]; then - __get_remote_file "$tools_source/korebuild/channels/$channel/latest.txt" "$lock_file" "$tools_source_suffix" - fi - version="$(grep 'version:*' -m 1 "$lock_file")" - if [[ "$version" == '' ]]; then - __error "Failed to parse version from $lock_file. Expected a line that begins with 'version:'" - return 1 - fi - version="$(echo "${version#version:}" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')" - local korebuild_path="$DOTNET_HOME/buildtools/korebuild/$version" - - if [ "$reinstall" = true ] && [ -d "$korebuild_path" ]; then - rm -rf "$korebuild_path" - fi - - { - if [ ! -d "$korebuild_path" ]; then - mkdir -p "$korebuild_path" - local remote_path="$tools_source/korebuild/artifacts/$version/korebuild.$version.zip" - tmpfile="$(mktemp)" - echo -e "${MAGENTA}Downloading KoreBuild ${version}${RESET}" - if __get_remote_file "$remote_path" "$tmpfile" "$tools_source_suffix"; then - unzip -q -d "$korebuild_path" "$tmpfile" - fi - rm "$tmpfile" || true - fi - - source "$korebuild_path/KoreBuild.sh" - } || { - if [ -d "$korebuild_path" ]; then - echo "Cleaning up after failed installation" - rm -rf "$korebuild_path" || true - fi - return 1 - } -} - -__error() { - echo -e "${RED}error: $*${RESET}" 1>&2 -} - -__warn() { - echo -e "${YELLOW}warning: $*${RESET}" -} - -__machine_has() { - hash "$1" > /dev/null 2>&1 - return $? -} - -__get_remote_file() { - local remote_path=$1 - local local_path=$2 - local remote_path_suffix=$3 - - if [[ "$remote_path" != 'http'* ]]; then - cp "$remote_path" "$local_path" - return 0 - fi - - local failed=false - if __machine_has wget; then - wget --tries 10 --quiet -O "$local_path" "${remote_path}${remote_path_suffix}" || failed=true - else - failed=true - fi - - if [ "$failed" = true ] && __machine_has curl; then - failed=false - curl --retry 10 -sSL -f --create-dirs -o "$local_path" "${remote_path}${remote_path_suffix}" || failed=true - fi - - if [ "$failed" = true ]; then - __error "Download failed: $remote_path" 1>&2 - return 1 - fi -} - -# -# main -# - -command="${1:-}" -shift - -while [[ $# -gt 0 ]]; do - case $1 in - -\?|-h|--help) - __usage --no-exit - exit 0 - ;; - -c|--channel|-Channel) - shift - channel="${1:-}" - [ -z "$channel" ] && __usage - ;; - --config-file|-ConfigFile) - shift - config_file="${1:-}" - [ -z "$config_file" ] && __usage - if [ ! -f "$config_file" ]; then - __error "Invalid value for --config-file. $config_file does not exist." - exit 1 - fi - ;; - -d|--dotnet-home|-DotNetHome) - shift - DOTNET_HOME="${1:-}" - [ -z "$DOTNET_HOME" ] && __usage - ;; - --path|-Path) - shift - repo_path="${1:-}" - [ -z "$repo_path" ] && __usage - ;; - -s|--tools-source|-ToolsSource) - shift - tools_source="${1:-}" - [ -z "$tools_source" ] && __usage - ;; - --tools-source-suffix|-ToolsSourceSuffix) - shift - tools_source_suffix="${1:-}" - [ -z "$tools_source_suffix" ] && __usage - ;; - -u|--update|-Update) - update=true - ;; - --reinstall|-[Rr]einstall) - reinstall=true - ;; - --ci|-[Cc][Ii]) - ci=true - ;; - --verbose|-Verbose) - verbose=true - ;; - --) - shift - break - ;; - *) - break - ;; - esac - shift -done - -if ! __machine_has unzip; then - __error 'Missing required command: unzip' - exit 1 -fi - -if ! __machine_has curl && ! __machine_has wget; then - __error 'Missing required command. Either wget or curl is required.' - exit 1 -fi - -[ -z "${config_file:-}" ] && config_file="$repo_path/korebuild.json" -if [ -f "$config_file" ]; then - if __machine_has jq ; then - if jq '.' "$config_file" >/dev/null ; then - config_channel="$(jq -r 'select(.channel!=null) | .channel' "$config_file")" - config_tools_source="$(jq -r 'select(.toolsSource!=null) | .toolsSource' "$config_file")" - else - __error "$config_file contains invalid JSON." - exit 1 - fi - elif __machine_has python ; then - if python -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'))" >/dev/null ; then - config_channel="$(python -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['channel'] if 'channel' in obj else '')")" - config_tools_source="$(python -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['toolsSource'] if 'toolsSource' in obj else '')")" - else - __error "$config_file contains invalid JSON." - exit 1 - fi - elif __machine_has python3 ; then - if python3 -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'))" >/dev/null ; then - config_channel="$(python3 -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['channel'] if 'channel' in obj else '')")" - config_tools_source="$(python3 -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['toolsSource'] if 'toolsSource' in obj else '')")" - else - __error "$config_file contains invalid JSON." - exit 1 - fi - else - __error 'Missing required command: jq or python. Could not parse the JSON file.' - exit 1 - fi - - [ ! -z "${config_channel:-}" ] && channel="$config_channel" - [ ! -z "${config_tools_source:-}" ] && tools_source="$config_tools_source" -fi - -[ -z "$channel" ] && channel='master' -[ -z "$tools_source" ] && tools_source='https://aspnetcore.blob.core.windows.net/buildtools' - -get_korebuild -set_korebuildsettings "$tools_source" "$DOTNET_HOME" "$repo_path" "$config_file" "$ci" -invoke_korebuild_command "$command" "$@" diff --git a/.gitignore b/src/MvcPrecompilation/.gitignore similarity index 100% rename from .gitignore rename to src/MvcPrecompilation/.gitignore diff --git a/Directory.Build.props b/src/MvcPrecompilation/Directory.Build.props similarity index 100% rename from Directory.Build.props rename to src/MvcPrecompilation/Directory.Build.props diff --git a/Directory.Build.targets b/src/MvcPrecompilation/Directory.Build.targets similarity index 100% rename from Directory.Build.targets rename to src/MvcPrecompilation/Directory.Build.targets diff --git a/NuGetPackageVerifier.json b/src/MvcPrecompilation/NuGetPackageVerifier.json similarity index 100% rename from NuGetPackageVerifier.json rename to src/MvcPrecompilation/NuGetPackageVerifier.json diff --git a/README.md b/src/MvcPrecompilation/README.md similarity index 100% rename from README.md rename to src/MvcPrecompilation/README.md diff --git a/RazorViewCompilation.sln b/src/MvcPrecompilation/RazorViewCompilation.sln similarity index 100% rename from RazorViewCompilation.sln rename to src/MvcPrecompilation/RazorViewCompilation.sln diff --git a/build/Key.snk b/src/MvcPrecompilation/build/Key.snk similarity index 100% rename from build/Key.snk rename to src/MvcPrecompilation/build/Key.snk diff --git a/build/dependencies.props b/src/MvcPrecompilation/build/dependencies.props similarity index 100% rename from build/dependencies.props rename to src/MvcPrecompilation/build/dependencies.props diff --git a/build/repo.props b/src/MvcPrecompilation/build/repo.props similarity index 100% rename from build/repo.props rename to src/MvcPrecompilation/build/repo.props diff --git a/build/sources.props b/src/MvcPrecompilation/build/sources.props similarity index 100% rename from build/sources.props rename to src/MvcPrecompilation/build/sources.props diff --git a/src/Directory.Build.props b/src/MvcPrecompilation/src/Directory.Build.props similarity index 100% rename from src/Directory.Build.props rename to src/MvcPrecompilation/src/Directory.Build.props diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tasks/GetDotNetHost.cs b/src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tasks/GetDotNetHost.cs similarity index 100% rename from src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tasks/GetDotNetHost.cs rename to src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tasks/GetDotNetHost.cs diff --git a/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 similarity index 100% rename from src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tasks/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tasks.csproj rename to src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tasks/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Tasks.csproj diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/AssemblyMetadataGenerator.cs b/src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/AssemblyMetadataGenerator.cs similarity index 100% rename from src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/AssemblyMetadataGenerator.cs rename to src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/AssemblyMetadataGenerator.cs diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/CompilationOptions.cs b/src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/CompilationOptions.cs similarity index 100% rename from src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/CompilationOptions.cs rename to src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/CompilationOptions.cs diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/DebugHelper.cs b/src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/DebugHelper.cs similarity index 100% rename from src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/DebugHelper.cs rename to src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/DebugHelper.cs diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/MvcServiceProvider.cs b/src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/MvcServiceProvider.cs similarity index 100% rename from src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/MvcServiceProvider.cs rename to src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/MvcServiceProvider.cs diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/PrecompilationApplication.cs b/src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/PrecompilationApplication.cs similarity index 100% rename from src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/PrecompilationApplication.cs rename to src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/PrecompilationApplication.cs diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/PrecompileRunCommand.cs b/src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/PrecompileRunCommand.cs similarity index 100% rename from src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/PrecompileRunCommand.cs rename to src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/PrecompileRunCommand.cs diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/SnkUtils.cs b/src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/SnkUtils.cs similarity index 100% rename from src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/SnkUtils.cs rename to src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/SnkUtils.cs diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/ViewCompilationInfo.cs b/src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/ViewCompilationInfo.cs similarity index 100% rename from src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/ViewCompilationInfo.cs rename to src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/ViewCompilationInfo.cs diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/ViewFileInfo.cs b/src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/ViewFileInfo.cs similarity index 100% rename from src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/ViewFileInfo.cs rename to src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Internal/ViewFileInfo.cs diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.csproj b/src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.csproj similarity index 100% rename from src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.csproj rename to src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.csproj diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.nuspec b/src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.nuspec similarity index 100% rename from src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.nuspec rename to src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.nuspec diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Program.cs b/src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Program.cs similarity index 100% rename from src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Program.cs rename to src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Program.cs diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Properties/AssemblyInfo.cs b/src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Properties/AssemblyInfo.cs similarity index 100% rename from src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Properties/AssemblyInfo.cs rename to src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/Properties/AssemblyInfo.cs diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/baseline.netcore.json b/src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/baseline.netcore.json similarity index 100% rename from src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/baseline.netcore.json rename to src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/baseline.netcore.json diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.targets b/src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.targets similarity index 100% rename from src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.targets rename to src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.targets diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/lib/net461/_._ b/src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/lib/net461/_._ similarity index 100% rename from src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/lib/net461/_._ rename to src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/lib/net461/_._ diff --git a/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/lib/netcoreapp2.0/_._ b/src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/lib/netcoreapp2.0/_._ similarity index 100% rename from src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/lib/netcoreapp2.0/_._ rename to src/MvcPrecompilation/src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/lib/netcoreapp2.0/_._ diff --git a/test/Directory.Build.props b/src/MvcPrecompilation/test/Directory.Build.props similarity index 100% rename from test/Directory.Build.props rename to src/MvcPrecompilation/test/Directory.Build.props diff --git a/test/FunctionalTests/CoreCLRTests/CoreCLRApplicationTestFixture.cs b/src/MvcPrecompilation/test/FunctionalTests/CoreCLRTests/CoreCLRApplicationTestFixture.cs similarity index 100% rename from test/FunctionalTests/CoreCLRTests/CoreCLRApplicationTestFixture.cs rename to src/MvcPrecompilation/test/FunctionalTests/CoreCLRTests/CoreCLRApplicationTestFixture.cs diff --git a/test/FunctionalTests/CoreCLRTests/SimpleAppTest_CoreCLR.cs b/src/MvcPrecompilation/test/FunctionalTests/CoreCLRTests/SimpleAppTest_CoreCLR.cs similarity index 100% rename from test/FunctionalTests/CoreCLRTests/SimpleAppTest_CoreCLR.cs rename to src/MvcPrecompilation/test/FunctionalTests/CoreCLRTests/SimpleAppTest_CoreCLR.cs diff --git a/test/FunctionalTests/DesktopTests/DesktopApplicationTestFixture.cs b/src/MvcPrecompilation/test/FunctionalTests/DesktopTests/DesktopApplicationTestFixture.cs similarity index 100% rename from test/FunctionalTests/DesktopTests/DesktopApplicationTestFixture.cs rename to src/MvcPrecompilation/test/FunctionalTests/DesktopTests/DesktopApplicationTestFixture.cs diff --git a/test/FunctionalTests/DesktopTests/SimpleAppTest_Desktop.cs b/src/MvcPrecompilation/test/FunctionalTests/DesktopTests/SimpleAppTest_Desktop.cs similarity index 100% rename from test/FunctionalTests/DesktopTests/SimpleAppTest_Desktop.cs rename to src/MvcPrecompilation/test/FunctionalTests/DesktopTests/SimpleAppTest_Desktop.cs diff --git a/test/FunctionalTests/FunctionalTests.csproj b/src/MvcPrecompilation/test/FunctionalTests/FunctionalTests.csproj similarity index 100% rename from test/FunctionalTests/FunctionalTests.csproj rename to src/MvcPrecompilation/test/FunctionalTests/FunctionalTests.csproj diff --git a/test/FunctionalTests/Infrastructure/ApplicationPaths.cs b/src/MvcPrecompilation/test/FunctionalTests/Infrastructure/ApplicationPaths.cs similarity index 100% rename from test/FunctionalTests/Infrastructure/ApplicationPaths.cs rename to src/MvcPrecompilation/test/FunctionalTests/Infrastructure/ApplicationPaths.cs diff --git a/test/FunctionalTests/Infrastructure/ApplicationTestFixture.cs b/src/MvcPrecompilation/test/FunctionalTests/Infrastructure/ApplicationTestFixture.cs similarity index 100% rename from test/FunctionalTests/Infrastructure/ApplicationTestFixture.cs rename to src/MvcPrecompilation/test/FunctionalTests/Infrastructure/ApplicationTestFixture.cs diff --git a/test/FunctionalTests/Infrastructure/HttpClientExtensions.cs b/src/MvcPrecompilation/test/FunctionalTests/Infrastructure/HttpClientExtensions.cs similarity index 100% rename from test/FunctionalTests/Infrastructure/HttpClientExtensions.cs rename to src/MvcPrecompilation/test/FunctionalTests/Infrastructure/HttpClientExtensions.cs diff --git a/test/FunctionalTests/Infrastructure/PublishOnlyDeployer.cs b/src/MvcPrecompilation/test/FunctionalTests/Infrastructure/PublishOnlyDeployer.cs similarity index 100% rename from test/FunctionalTests/Infrastructure/PublishOnlyDeployer.cs rename to src/MvcPrecompilation/test/FunctionalTests/Infrastructure/PublishOnlyDeployer.cs diff --git a/test/FunctionalTests/Infrastructure/TestEmbeddedResource.cs b/src/MvcPrecompilation/test/FunctionalTests/Infrastructure/TestEmbeddedResource.cs similarity index 100% rename from test/FunctionalTests/Infrastructure/TestEmbeddedResource.cs rename to src/MvcPrecompilation/test/FunctionalTests/Infrastructure/TestEmbeddedResource.cs diff --git a/test/FunctionalTests/Properties/AssemblyInfo.cs b/src/MvcPrecompilation/test/FunctionalTests/Properties/AssemblyInfo.cs similarity index 100% rename from test/FunctionalTests/Properties/AssemblyInfo.cs rename to src/MvcPrecompilation/test/FunctionalTests/Properties/AssemblyInfo.cs diff --git a/test/FunctionalTests/Resources/SimpleAppTest.Home.Index.txt b/src/MvcPrecompilation/test/FunctionalTests/Resources/SimpleAppTest.Home.Index.txt similarity index 100% rename from test/FunctionalTests/Resources/SimpleAppTest.Home.Index.txt rename to src/MvcPrecompilation/test/FunctionalTests/Resources/SimpleAppTest.Home.Index.txt diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test.csproj b/src/MvcPrecompilation/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test.csproj similarity index 100% rename from test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test.csproj rename to src/MvcPrecompilation/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test.csproj diff --git a/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test/PrecompileRunCommandTest.cs b/src/MvcPrecompilation/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test/PrecompileRunCommandTest.cs similarity index 100% rename from test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test/PrecompileRunCommandTest.cs rename to src/MvcPrecompilation/test/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.Test/PrecompileRunCommandTest.cs diff --git a/testapps/ApplicationWithConfigureMvc/ApplicationWithConfigureMvc.csproj b/src/MvcPrecompilation/testapps/ApplicationWithConfigureMvc/ApplicationWithConfigureMvc.csproj similarity index 100% rename from testapps/ApplicationWithConfigureMvc/ApplicationWithConfigureMvc.csproj rename to src/MvcPrecompilation/testapps/ApplicationWithConfigureMvc/ApplicationWithConfigureMvc.csproj diff --git a/testapps/ApplicationWithConfigureMvc/Controllers/HomeController.cs b/src/MvcPrecompilation/testapps/ApplicationWithConfigureMvc/Controllers/HomeController.cs similarity index 100% rename from testapps/ApplicationWithConfigureMvc/Controllers/HomeController.cs rename to src/MvcPrecompilation/testapps/ApplicationWithConfigureMvc/Controllers/HomeController.cs diff --git a/testapps/ApplicationWithConfigureMvc/Program.cs b/src/MvcPrecompilation/testapps/ApplicationWithConfigureMvc/Program.cs similarity index 100% rename from testapps/ApplicationWithConfigureMvc/Program.cs rename to src/MvcPrecompilation/testapps/ApplicationWithConfigureMvc/Program.cs diff --git a/testapps/ApplicationWithConfigureMvc/RazorRewriter.cs b/src/MvcPrecompilation/testapps/ApplicationWithConfigureMvc/RazorRewriter.cs similarity index 100% rename from testapps/ApplicationWithConfigureMvc/RazorRewriter.cs rename to src/MvcPrecompilation/testapps/ApplicationWithConfigureMvc/RazorRewriter.cs diff --git a/testapps/ApplicationWithConfigureMvc/Startup.cs b/src/MvcPrecompilation/testapps/ApplicationWithConfigureMvc/Startup.cs similarity index 100% rename from testapps/ApplicationWithConfigureMvc/Startup.cs rename to src/MvcPrecompilation/testapps/ApplicationWithConfigureMvc/Startup.cs diff --git a/testapps/ApplicationWithConfigureMvc/Views/Home/Index.cshtml b/src/MvcPrecompilation/testapps/ApplicationWithConfigureMvc/Views/Home/Index.cshtml similarity index 100% rename from testapps/ApplicationWithConfigureMvc/Views/Home/Index.cshtml rename to src/MvcPrecompilation/testapps/ApplicationWithConfigureMvc/Views/Home/Index.cshtml diff --git a/testapps/ApplicationWithConfigureMvc/Views/Home/ViewWithPreprocessor.cshtml b/src/MvcPrecompilation/testapps/ApplicationWithConfigureMvc/Views/Home/ViewWithPreprocessor.cshtml similarity index 100% rename from testapps/ApplicationWithConfigureMvc/Views/Home/ViewWithPreprocessor.cshtml rename to src/MvcPrecompilation/testapps/ApplicationWithConfigureMvc/Views/Home/ViewWithPreprocessor.cshtml diff --git a/testapps/ApplicationWithCustomInputFiles/ApplicationWithCustomInputFiles.csproj b/src/MvcPrecompilation/testapps/ApplicationWithCustomInputFiles/ApplicationWithCustomInputFiles.csproj similarity index 100% rename from testapps/ApplicationWithCustomInputFiles/ApplicationWithCustomInputFiles.csproj rename to src/MvcPrecompilation/testapps/ApplicationWithCustomInputFiles/ApplicationWithCustomInputFiles.csproj diff --git a/testapps/ApplicationWithCustomInputFiles/Controllers/HomeController.cs b/src/MvcPrecompilation/testapps/ApplicationWithCustomInputFiles/Controllers/HomeController.cs similarity index 100% rename from testapps/ApplicationWithCustomInputFiles/Controllers/HomeController.cs rename to src/MvcPrecompilation/testapps/ApplicationWithCustomInputFiles/Controllers/HomeController.cs diff --git a/testapps/ApplicationWithCustomInputFiles/Program.cs b/src/MvcPrecompilation/testapps/ApplicationWithCustomInputFiles/Program.cs similarity index 100% rename from testapps/ApplicationWithCustomInputFiles/Program.cs rename to src/MvcPrecompilation/testapps/ApplicationWithCustomInputFiles/Program.cs diff --git a/testapps/ApplicationWithCustomInputFiles/Startup.cs b/src/MvcPrecompilation/testapps/ApplicationWithCustomInputFiles/Startup.cs similarity index 100% rename from testapps/ApplicationWithCustomInputFiles/Startup.cs rename to src/MvcPrecompilation/testapps/ApplicationWithCustomInputFiles/Startup.cs diff --git a/testapps/ApplicationWithCustomInputFiles/Views/Home/About.cshtml b/src/MvcPrecompilation/testapps/ApplicationWithCustomInputFiles/Views/Home/About.cshtml similarity index 100% rename from testapps/ApplicationWithCustomInputFiles/Views/Home/About.cshtml rename to src/MvcPrecompilation/testapps/ApplicationWithCustomInputFiles/Views/Home/About.cshtml diff --git a/testapps/ApplicationWithCustomInputFiles/Views/Home/Index.cshtml b/src/MvcPrecompilation/testapps/ApplicationWithCustomInputFiles/Views/Home/Index.cshtml similarity index 100% rename from testapps/ApplicationWithCustomInputFiles/Views/Home/Index.cshtml rename to src/MvcPrecompilation/testapps/ApplicationWithCustomInputFiles/Views/Home/Index.cshtml diff --git a/testapps/ApplicationWithCustomInputFiles/Views/Home/NotIncluded.cshtml b/src/MvcPrecompilation/testapps/ApplicationWithCustomInputFiles/Views/Home/NotIncluded.cshtml similarity index 100% rename from testapps/ApplicationWithCustomInputFiles/Views/Home/NotIncluded.cshtml rename to src/MvcPrecompilation/testapps/ApplicationWithCustomInputFiles/Views/Home/NotIncluded.cshtml diff --git a/testapps/ApplicationWithParseErrors/ApplicationWithParseErrors.csproj b/src/MvcPrecompilation/testapps/ApplicationWithParseErrors/ApplicationWithParseErrors.csproj similarity index 100% rename from testapps/ApplicationWithParseErrors/ApplicationWithParseErrors.csproj rename to src/MvcPrecompilation/testapps/ApplicationWithParseErrors/ApplicationWithParseErrors.csproj diff --git a/testapps/ApplicationWithParseErrors/Program.cs b/src/MvcPrecompilation/testapps/ApplicationWithParseErrors/Program.cs similarity index 100% rename from testapps/ApplicationWithParseErrors/Program.cs rename to src/MvcPrecompilation/testapps/ApplicationWithParseErrors/Program.cs diff --git a/testapps/ApplicationWithParseErrors/Startup.cs b/src/MvcPrecompilation/testapps/ApplicationWithParseErrors/Startup.cs similarity index 100% rename from testapps/ApplicationWithParseErrors/Startup.cs rename to src/MvcPrecompilation/testapps/ApplicationWithParseErrors/Startup.cs diff --git a/testapps/ApplicationWithParseErrors/Views/Home/About.cshtml b/src/MvcPrecompilation/testapps/ApplicationWithParseErrors/Views/Home/About.cshtml similarity index 100% rename from testapps/ApplicationWithParseErrors/Views/Home/About.cshtml rename to src/MvcPrecompilation/testapps/ApplicationWithParseErrors/Views/Home/About.cshtml diff --git a/testapps/ApplicationWithParseErrors/Views/Home/Index.cshtml b/src/MvcPrecompilation/testapps/ApplicationWithParseErrors/Views/Home/Index.cshtml similarity index 100% rename from testapps/ApplicationWithParseErrors/Views/Home/Index.cshtml rename to src/MvcPrecompilation/testapps/ApplicationWithParseErrors/Views/Home/Index.cshtml diff --git a/testapps/ApplicationWithRazorSdkNeitherUsed/ApplicationWithRazorSdkNeitherUsed.csproj b/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkNeitherUsed/ApplicationWithRazorSdkNeitherUsed.csproj similarity index 100% rename from testapps/ApplicationWithRazorSdkNeitherUsed/ApplicationWithRazorSdkNeitherUsed.csproj rename to src/MvcPrecompilation/testapps/ApplicationWithRazorSdkNeitherUsed/ApplicationWithRazorSdkNeitherUsed.csproj diff --git a/testapps/ApplicationWithRazorSdkNeitherUsed/Controllers/HomeController.cs b/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkNeitherUsed/Controllers/HomeController.cs similarity index 100% rename from testapps/ApplicationWithRazorSdkNeitherUsed/Controllers/HomeController.cs rename to src/MvcPrecompilation/testapps/ApplicationWithRazorSdkNeitherUsed/Controllers/HomeController.cs diff --git a/testapps/ApplicationWithRazorSdkNeitherUsed/Program.cs b/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkNeitherUsed/Program.cs similarity index 100% rename from testapps/ApplicationWithRazorSdkNeitherUsed/Program.cs rename to src/MvcPrecompilation/testapps/ApplicationWithRazorSdkNeitherUsed/Program.cs diff --git a/testapps/ApplicationWithRazorSdkNeitherUsed/Startup.cs b/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkNeitherUsed/Startup.cs similarity index 100% rename from testapps/ApplicationWithRazorSdkNeitherUsed/Startup.cs rename to src/MvcPrecompilation/testapps/ApplicationWithRazorSdkNeitherUsed/Startup.cs diff --git a/testapps/ApplicationWithRazorSdkNeitherUsed/Views/Home/About.cshtml b/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkNeitherUsed/Views/Home/About.cshtml similarity index 100% rename from testapps/ApplicationWithRazorSdkNeitherUsed/Views/Home/About.cshtml rename to src/MvcPrecompilation/testapps/ApplicationWithRazorSdkNeitherUsed/Views/Home/About.cshtml diff --git a/testapps/ApplicationWithRazorSdkNeitherUsed/Views/Home/Index.cshtml b/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkNeitherUsed/Views/Home/Index.cshtml similarity index 100% rename from testapps/ApplicationWithRazorSdkNeitherUsed/Views/Home/Index.cshtml rename to src/MvcPrecompilation/testapps/ApplicationWithRazorSdkNeitherUsed/Views/Home/Index.cshtml diff --git a/testapps/ApplicationWithRazorSdkNeitherUsed/Views/Shared/_Layout.cshtml b/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkNeitherUsed/Views/Shared/_Layout.cshtml similarity index 100% rename from testapps/ApplicationWithRazorSdkNeitherUsed/Views/Shared/_Layout.cshtml rename to src/MvcPrecompilation/testapps/ApplicationWithRazorSdkNeitherUsed/Views/Shared/_Layout.cshtml diff --git a/testapps/ApplicationWithRazorSdkNeitherUsed/Views/_ViewImports.cshtml b/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkNeitherUsed/Views/_ViewImports.cshtml similarity index 100% rename from testapps/ApplicationWithRazorSdkNeitherUsed/Views/_ViewImports.cshtml rename to src/MvcPrecompilation/testapps/ApplicationWithRazorSdkNeitherUsed/Views/_ViewImports.cshtml diff --git a/testapps/ApplicationWithRazorSdkNeitherUsed/Views/_ViewStart.cshtml b/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkNeitherUsed/Views/_ViewStart.cshtml similarity index 100% rename from testapps/ApplicationWithRazorSdkNeitherUsed/Views/_ViewStart.cshtml rename to src/MvcPrecompilation/testapps/ApplicationWithRazorSdkNeitherUsed/Views/_ViewStart.cshtml diff --git a/testapps/ApplicationWithRazorSdkPrecompilationUsed/ApplicationWithRazorSdkPrecompilationUsed.csproj b/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkPrecompilationUsed/ApplicationWithRazorSdkPrecompilationUsed.csproj similarity index 100% rename from testapps/ApplicationWithRazorSdkPrecompilationUsed/ApplicationWithRazorSdkPrecompilationUsed.csproj rename to src/MvcPrecompilation/testapps/ApplicationWithRazorSdkPrecompilationUsed/ApplicationWithRazorSdkPrecompilationUsed.csproj diff --git a/testapps/ApplicationWithRazorSdkPrecompilationUsed/Controllers/HomeController.cs b/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkPrecompilationUsed/Controllers/HomeController.cs similarity index 100% rename from testapps/ApplicationWithRazorSdkPrecompilationUsed/Controllers/HomeController.cs rename to src/MvcPrecompilation/testapps/ApplicationWithRazorSdkPrecompilationUsed/Controllers/HomeController.cs diff --git a/testapps/ApplicationWithRazorSdkPrecompilationUsed/Program.cs b/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkPrecompilationUsed/Program.cs similarity index 100% rename from testapps/ApplicationWithRazorSdkPrecompilationUsed/Program.cs rename to src/MvcPrecompilation/testapps/ApplicationWithRazorSdkPrecompilationUsed/Program.cs diff --git a/testapps/ApplicationWithRazorSdkPrecompilationUsed/Startup.cs b/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkPrecompilationUsed/Startup.cs similarity index 100% rename from testapps/ApplicationWithRazorSdkPrecompilationUsed/Startup.cs rename to src/MvcPrecompilation/testapps/ApplicationWithRazorSdkPrecompilationUsed/Startup.cs diff --git a/testapps/ApplicationWithRazorSdkPrecompilationUsed/Views/Home/About.cshtml b/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkPrecompilationUsed/Views/Home/About.cshtml similarity index 100% rename from testapps/ApplicationWithRazorSdkPrecompilationUsed/Views/Home/About.cshtml rename to src/MvcPrecompilation/testapps/ApplicationWithRazorSdkPrecompilationUsed/Views/Home/About.cshtml diff --git a/testapps/ApplicationWithRazorSdkPrecompilationUsed/Views/Home/Index.cshtml b/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkPrecompilationUsed/Views/Home/Index.cshtml similarity index 100% rename from testapps/ApplicationWithRazorSdkPrecompilationUsed/Views/Home/Index.cshtml rename to src/MvcPrecompilation/testapps/ApplicationWithRazorSdkPrecompilationUsed/Views/Home/Index.cshtml diff --git a/testapps/ApplicationWithRazorSdkPrecompilationUsed/Views/Shared/_Layout.cshtml b/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkPrecompilationUsed/Views/Shared/_Layout.cshtml similarity index 100% rename from testapps/ApplicationWithRazorSdkPrecompilationUsed/Views/Shared/_Layout.cshtml rename to src/MvcPrecompilation/testapps/ApplicationWithRazorSdkPrecompilationUsed/Views/Shared/_Layout.cshtml diff --git a/testapps/ApplicationWithRazorSdkPrecompilationUsed/Views/_ViewImports.cshtml b/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkPrecompilationUsed/Views/_ViewImports.cshtml similarity index 100% rename from testapps/ApplicationWithRazorSdkPrecompilationUsed/Views/_ViewImports.cshtml rename to src/MvcPrecompilation/testapps/ApplicationWithRazorSdkPrecompilationUsed/Views/_ViewImports.cshtml diff --git a/testapps/ApplicationWithRazorSdkPrecompilationUsed/Views/_ViewStart.cshtml b/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkPrecompilationUsed/Views/_ViewStart.cshtml similarity index 100% rename from testapps/ApplicationWithRazorSdkPrecompilationUsed/Views/_ViewStart.cshtml rename to src/MvcPrecompilation/testapps/ApplicationWithRazorSdkPrecompilationUsed/Views/_ViewStart.cshtml diff --git a/testapps/ApplicationWithRazorSdkUsed/ApplicationWithRazorSdkUsed.csproj b/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkUsed/ApplicationWithRazorSdkUsed.csproj similarity index 100% rename from testapps/ApplicationWithRazorSdkUsed/ApplicationWithRazorSdkUsed.csproj rename to src/MvcPrecompilation/testapps/ApplicationWithRazorSdkUsed/ApplicationWithRazorSdkUsed.csproj diff --git a/testapps/ApplicationWithRazorSdkUsed/Controllers/HomeController.cs b/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkUsed/Controllers/HomeController.cs similarity index 100% rename from testapps/ApplicationWithRazorSdkUsed/Controllers/HomeController.cs rename to src/MvcPrecompilation/testapps/ApplicationWithRazorSdkUsed/Controllers/HomeController.cs diff --git a/testapps/ApplicationWithRazorSdkUsed/Program.cs b/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkUsed/Program.cs similarity index 100% rename from testapps/ApplicationWithRazorSdkUsed/Program.cs rename to src/MvcPrecompilation/testapps/ApplicationWithRazorSdkUsed/Program.cs diff --git a/testapps/ApplicationWithRazorSdkUsed/Startup.cs b/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkUsed/Startup.cs similarity index 100% rename from testapps/ApplicationWithRazorSdkUsed/Startup.cs rename to src/MvcPrecompilation/testapps/ApplicationWithRazorSdkUsed/Startup.cs diff --git a/testapps/ApplicationWithRazorSdkUsed/Views/Home/About.cshtml b/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkUsed/Views/Home/About.cshtml similarity index 100% rename from testapps/ApplicationWithRazorSdkUsed/Views/Home/About.cshtml rename to src/MvcPrecompilation/testapps/ApplicationWithRazorSdkUsed/Views/Home/About.cshtml diff --git a/testapps/ApplicationWithRazorSdkUsed/Views/Home/Index.cshtml b/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkUsed/Views/Home/Index.cshtml similarity index 100% rename from testapps/ApplicationWithRazorSdkUsed/Views/Home/Index.cshtml rename to src/MvcPrecompilation/testapps/ApplicationWithRazorSdkUsed/Views/Home/Index.cshtml diff --git a/testapps/ApplicationWithRazorSdkUsed/Views/Shared/_Layout.cshtml b/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkUsed/Views/Shared/_Layout.cshtml similarity index 100% rename from testapps/ApplicationWithRazorSdkUsed/Views/Shared/_Layout.cshtml rename to src/MvcPrecompilation/testapps/ApplicationWithRazorSdkUsed/Views/Shared/_Layout.cshtml diff --git a/testapps/ApplicationWithRazorSdkUsed/Views/_ViewImports.cshtml b/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkUsed/Views/_ViewImports.cshtml similarity index 100% rename from testapps/ApplicationWithRazorSdkUsed/Views/_ViewImports.cshtml rename to src/MvcPrecompilation/testapps/ApplicationWithRazorSdkUsed/Views/_ViewImports.cshtml diff --git a/testapps/ApplicationWithRazorSdkUsed/Views/_ViewStart.cshtml b/src/MvcPrecompilation/testapps/ApplicationWithRazorSdkUsed/Views/_ViewStart.cshtml similarity index 100% rename from testapps/ApplicationWithRazorSdkUsed/Views/_ViewStart.cshtml rename to src/MvcPrecompilation/testapps/ApplicationWithRazorSdkUsed/Views/_ViewStart.cshtml diff --git a/testapps/ApplicationWithTagHelpers/ApplicationWithTagHelpers.csproj b/src/MvcPrecompilation/testapps/ApplicationWithTagHelpers/ApplicationWithTagHelpers.csproj similarity index 100% rename from testapps/ApplicationWithTagHelpers/ApplicationWithTagHelpers.csproj rename to src/MvcPrecompilation/testapps/ApplicationWithTagHelpers/ApplicationWithTagHelpers.csproj diff --git a/testapps/ApplicationWithTagHelpers/Components/CopyrightViewComponent.cs b/src/MvcPrecompilation/testapps/ApplicationWithTagHelpers/Components/CopyrightViewComponent.cs similarity index 100% rename from testapps/ApplicationWithTagHelpers/Components/CopyrightViewComponent.cs rename to src/MvcPrecompilation/testapps/ApplicationWithTagHelpers/Components/CopyrightViewComponent.cs diff --git a/testapps/ApplicationWithTagHelpers/Controllers/HomeController.cs b/src/MvcPrecompilation/testapps/ApplicationWithTagHelpers/Controllers/HomeController.cs similarity index 100% rename from testapps/ApplicationWithTagHelpers/Controllers/HomeController.cs rename to src/MvcPrecompilation/testapps/ApplicationWithTagHelpers/Controllers/HomeController.cs diff --git a/testapps/ApplicationWithTagHelpers/Program.cs b/src/MvcPrecompilation/testapps/ApplicationWithTagHelpers/Program.cs similarity index 100% rename from testapps/ApplicationWithTagHelpers/Program.cs rename to src/MvcPrecompilation/testapps/ApplicationWithTagHelpers/Program.cs diff --git a/testapps/ApplicationWithTagHelpers/Startup.cs b/src/MvcPrecompilation/testapps/ApplicationWithTagHelpers/Startup.cs similarity index 100% rename from testapps/ApplicationWithTagHelpers/Startup.cs rename to src/MvcPrecompilation/testapps/ApplicationWithTagHelpers/Startup.cs diff --git a/testapps/ApplicationWithTagHelpers/TagHelpers/TestTagHelper.cs b/src/MvcPrecompilation/testapps/ApplicationWithTagHelpers/TagHelpers/TestTagHelper.cs similarity index 100% rename from testapps/ApplicationWithTagHelpers/TagHelpers/TestTagHelper.cs rename to src/MvcPrecompilation/testapps/ApplicationWithTagHelpers/TagHelpers/TestTagHelper.cs diff --git a/testapps/ApplicationWithTagHelpers/Views/Home/ClassLibraryTagHelper.cshtml b/src/MvcPrecompilation/testapps/ApplicationWithTagHelpers/Views/Home/ClassLibraryTagHelper.cshtml similarity index 100% rename from testapps/ApplicationWithTagHelpers/Views/Home/ClassLibraryTagHelper.cshtml rename to src/MvcPrecompilation/testapps/ApplicationWithTagHelpers/Views/Home/ClassLibraryTagHelper.cshtml diff --git a/testapps/ApplicationWithTagHelpers/Views/Home/LocalTagHelper.cshtml b/src/MvcPrecompilation/testapps/ApplicationWithTagHelpers/Views/Home/LocalTagHelper.cshtml similarity index 100% rename from testapps/ApplicationWithTagHelpers/Views/Home/LocalTagHelper.cshtml rename to src/MvcPrecompilation/testapps/ApplicationWithTagHelpers/Views/Home/LocalTagHelper.cshtml diff --git a/testapps/ApplicationWithTagHelpers/Views/Shared/Components/Copyright/Default.cshtml b/src/MvcPrecompilation/testapps/ApplicationWithTagHelpers/Views/Shared/Components/Copyright/Default.cshtml similarity index 100% rename from testapps/ApplicationWithTagHelpers/Views/Shared/Components/Copyright/Default.cshtml rename to src/MvcPrecompilation/testapps/ApplicationWithTagHelpers/Views/Shared/Components/Copyright/Default.cshtml diff --git a/testapps/ApplicationWithTagHelpers/Views/Shared/_Layout.cshtml b/src/MvcPrecompilation/testapps/ApplicationWithTagHelpers/Views/Shared/_Layout.cshtml similarity index 100% rename from testapps/ApplicationWithTagHelpers/Views/Shared/_Layout.cshtml rename to src/MvcPrecompilation/testapps/ApplicationWithTagHelpers/Views/Shared/_Layout.cshtml diff --git a/testapps/ApplicationWithTagHelpers/Views/_ViewImports.cshtml b/src/MvcPrecompilation/testapps/ApplicationWithTagHelpers/Views/_ViewImports.cshtml similarity index 100% rename from testapps/ApplicationWithTagHelpers/Views/_ViewImports.cshtml rename to src/MvcPrecompilation/testapps/ApplicationWithTagHelpers/Views/_ViewImports.cshtml diff --git a/testapps/ApplicationWithTagHelpers/Views/_ViewStart.cshtml b/src/MvcPrecompilation/testapps/ApplicationWithTagHelpers/Views/_ViewStart.cshtml similarity index 100% rename from testapps/ApplicationWithTagHelpers/Views/_ViewStart.cshtml rename to src/MvcPrecompilation/testapps/ApplicationWithTagHelpers/Views/_ViewStart.cshtml diff --git a/testapps/ClassLibraryTagHelper/BoldTagHelper.cs b/src/MvcPrecompilation/testapps/ClassLibraryTagHelper/BoldTagHelper.cs similarity index 100% rename from testapps/ClassLibraryTagHelper/BoldTagHelper.cs rename to src/MvcPrecompilation/testapps/ClassLibraryTagHelper/BoldTagHelper.cs diff --git a/testapps/ClassLibraryTagHelper/ClassLibraryTagHelper.csproj b/src/MvcPrecompilation/testapps/ClassLibraryTagHelper/ClassLibraryTagHelper.csproj similarity index 100% rename from testapps/ClassLibraryTagHelper/ClassLibraryTagHelper.csproj rename to src/MvcPrecompilation/testapps/ClassLibraryTagHelper/ClassLibraryTagHelper.csproj diff --git a/testapps/Directory.Build.props b/src/MvcPrecompilation/testapps/Directory.Build.props similarity index 100% rename from testapps/Directory.Build.props rename to src/MvcPrecompilation/testapps/Directory.Build.props diff --git a/testapps/Directory.Build.targets b/src/MvcPrecompilation/testapps/Directory.Build.targets similarity index 100% rename from testapps/Directory.Build.targets rename to src/MvcPrecompilation/testapps/Directory.Build.targets diff --git a/testapps/PublishWithEmbedViewSources/Areas/TestArea/Views/Home/Index.cshtml b/src/MvcPrecompilation/testapps/PublishWithEmbedViewSources/Areas/TestArea/Views/Home/Index.cshtml similarity index 100% rename from testapps/PublishWithEmbedViewSources/Areas/TestArea/Views/Home/Index.cshtml rename to src/MvcPrecompilation/testapps/PublishWithEmbedViewSources/Areas/TestArea/Views/Home/Index.cshtml diff --git a/testapps/PublishWithEmbedViewSources/Controllers/HomeController.cs b/src/MvcPrecompilation/testapps/PublishWithEmbedViewSources/Controllers/HomeController.cs similarity index 100% rename from testapps/PublishWithEmbedViewSources/Controllers/HomeController.cs rename to src/MvcPrecompilation/testapps/PublishWithEmbedViewSources/Controllers/HomeController.cs diff --git a/testapps/PublishWithEmbedViewSources/Program.cs b/src/MvcPrecompilation/testapps/PublishWithEmbedViewSources/Program.cs similarity index 100% rename from testapps/PublishWithEmbedViewSources/Program.cs rename to src/MvcPrecompilation/testapps/PublishWithEmbedViewSources/Program.cs diff --git a/testapps/PublishWithEmbedViewSources/PublishWithEmbedViewSources.csproj b/src/MvcPrecompilation/testapps/PublishWithEmbedViewSources/PublishWithEmbedViewSources.csproj similarity index 100% rename from testapps/PublishWithEmbedViewSources/PublishWithEmbedViewSources.csproj rename to src/MvcPrecompilation/testapps/PublishWithEmbedViewSources/PublishWithEmbedViewSources.csproj diff --git a/testapps/PublishWithEmbedViewSources/Startup.cs b/src/MvcPrecompilation/testapps/PublishWithEmbedViewSources/Startup.cs similarity index 100% rename from testapps/PublishWithEmbedViewSources/Startup.cs rename to src/MvcPrecompilation/testapps/PublishWithEmbedViewSources/Startup.cs diff --git a/testapps/PublishWithEmbedViewSources/Views/Home/About.cshtml b/src/MvcPrecompilation/testapps/PublishWithEmbedViewSources/Views/Home/About.cshtml similarity index 100% rename from testapps/PublishWithEmbedViewSources/Views/Home/About.cshtml rename to src/MvcPrecompilation/testapps/PublishWithEmbedViewSources/Views/Home/About.cshtml diff --git a/testapps/PublishWithEmbedViewSources/Views/Home/Index.cshtml b/src/MvcPrecompilation/testapps/PublishWithEmbedViewSources/Views/Home/Index.cshtml similarity index 100% rename from testapps/PublishWithEmbedViewSources/Views/Home/Index.cshtml rename to src/MvcPrecompilation/testapps/PublishWithEmbedViewSources/Views/Home/Index.cshtml diff --git a/testapps/RazorPagesApp/Pages/Auth/Index.cshtml b/src/MvcPrecompilation/testapps/RazorPagesApp/Pages/Auth/Index.cshtml similarity index 100% rename from testapps/RazorPagesApp/Pages/Auth/Index.cshtml rename to src/MvcPrecompilation/testapps/RazorPagesApp/Pages/Auth/Index.cshtml diff --git a/testapps/RazorPagesApp/Pages/Index.cshtml b/src/MvcPrecompilation/testapps/RazorPagesApp/Pages/Index.cshtml similarity index 100% rename from testapps/RazorPagesApp/Pages/Index.cshtml rename to src/MvcPrecompilation/testapps/RazorPagesApp/Pages/Index.cshtml diff --git a/testapps/RazorPagesApp/Pages/Login.cshtml b/src/MvcPrecompilation/testapps/RazorPagesApp/Pages/Login.cshtml similarity index 100% rename from testapps/RazorPagesApp/Pages/Login.cshtml rename to src/MvcPrecompilation/testapps/RazorPagesApp/Pages/Login.cshtml diff --git a/testapps/RazorPagesApp/Pages/MyPageModel.cs b/src/MvcPrecompilation/testapps/RazorPagesApp/Pages/MyPageModel.cs similarity index 100% rename from testapps/RazorPagesApp/Pages/MyPageModel.cs rename to src/MvcPrecompilation/testapps/RazorPagesApp/Pages/MyPageModel.cs diff --git a/testapps/RazorPagesApp/Pages/Nested1/Nested2/PageWithTagHelper.cshtml b/src/MvcPrecompilation/testapps/RazorPagesApp/Pages/Nested1/Nested2/PageWithTagHelper.cshtml similarity index 100% rename from testapps/RazorPagesApp/Pages/Nested1/Nested2/PageWithTagHelper.cshtml rename to src/MvcPrecompilation/testapps/RazorPagesApp/Pages/Nested1/Nested2/PageWithTagHelper.cshtml diff --git a/testapps/RazorPagesApp/Pages/Nested1/_ViewImports.cshtml b/src/MvcPrecompilation/testapps/RazorPagesApp/Pages/Nested1/_ViewImports.cshtml similarity index 100% rename from testapps/RazorPagesApp/Pages/Nested1/_ViewImports.cshtml rename to src/MvcPrecompilation/testapps/RazorPagesApp/Pages/Nested1/_ViewImports.cshtml diff --git a/testapps/RazorPagesApp/Pages/PageWithModel.cshtml b/src/MvcPrecompilation/testapps/RazorPagesApp/Pages/PageWithModel.cshtml similarity index 100% rename from testapps/RazorPagesApp/Pages/PageWithModel.cshtml rename to src/MvcPrecompilation/testapps/RazorPagesApp/Pages/PageWithModel.cshtml diff --git a/testapps/RazorPagesApp/Pages/PageWithRoute.cshtml b/src/MvcPrecompilation/testapps/RazorPagesApp/Pages/PageWithRoute.cshtml similarity index 100% rename from testapps/RazorPagesApp/Pages/PageWithRoute.cshtml rename to src/MvcPrecompilation/testapps/RazorPagesApp/Pages/PageWithRoute.cshtml diff --git a/testapps/RazorPagesApp/Pages/_PageStart.cshtml b/src/MvcPrecompilation/testapps/RazorPagesApp/Pages/_PageStart.cshtml similarity index 100% rename from testapps/RazorPagesApp/Pages/_PageStart.cshtml rename to src/MvcPrecompilation/testapps/RazorPagesApp/Pages/_PageStart.cshtml diff --git a/testapps/RazorPagesApp/Pages/_ViewImports.cshtml b/src/MvcPrecompilation/testapps/RazorPagesApp/Pages/_ViewImports.cshtml similarity index 100% rename from testapps/RazorPagesApp/Pages/_ViewImports.cshtml rename to src/MvcPrecompilation/testapps/RazorPagesApp/Pages/_ViewImports.cshtml diff --git a/testapps/RazorPagesApp/Program.cs b/src/MvcPrecompilation/testapps/RazorPagesApp/Program.cs similarity index 100% rename from testapps/RazorPagesApp/Program.cs rename to src/MvcPrecompilation/testapps/RazorPagesApp/Program.cs diff --git a/testapps/RazorPagesApp/RazorPagesApp.csproj b/src/MvcPrecompilation/testapps/RazorPagesApp/RazorPagesApp.csproj similarity index 100% rename from testapps/RazorPagesApp/RazorPagesApp.csproj rename to src/MvcPrecompilation/testapps/RazorPagesApp/RazorPagesApp.csproj diff --git a/testapps/RazorPagesApp/Startup.cs b/src/MvcPrecompilation/testapps/RazorPagesApp/Startup.cs similarity index 100% rename from testapps/RazorPagesApp/Startup.cs rename to src/MvcPrecompilation/testapps/RazorPagesApp/Startup.cs diff --git a/testapps/RazorPagesApp/Views/Shared/_Layout.cshtml b/src/MvcPrecompilation/testapps/RazorPagesApp/Views/Shared/_Layout.cshtml similarity index 100% rename from testapps/RazorPagesApp/Views/Shared/_Layout.cshtml rename to src/MvcPrecompilation/testapps/RazorPagesApp/Views/Shared/_Layout.cshtml diff --git a/testapps/SimpleApp/Controllers/HomeController.cs b/src/MvcPrecompilation/testapps/SimpleApp/Controllers/HomeController.cs similarity index 100% rename from testapps/SimpleApp/Controllers/HomeController.cs rename to src/MvcPrecompilation/testapps/SimpleApp/Controllers/HomeController.cs diff --git a/testapps/SimpleApp/Program.cs b/src/MvcPrecompilation/testapps/SimpleApp/Program.cs similarity index 100% rename from testapps/SimpleApp/Program.cs rename to src/MvcPrecompilation/testapps/SimpleApp/Program.cs diff --git a/testapps/SimpleApp/SimpleApp.csproj b/src/MvcPrecompilation/testapps/SimpleApp/SimpleApp.csproj similarity index 100% rename from testapps/SimpleApp/SimpleApp.csproj rename to src/MvcPrecompilation/testapps/SimpleApp/SimpleApp.csproj diff --git a/testapps/SimpleApp/Startup.cs b/src/MvcPrecompilation/testapps/SimpleApp/Startup.cs similarity index 100% rename from testapps/SimpleApp/Startup.cs rename to src/MvcPrecompilation/testapps/SimpleApp/Startup.cs diff --git a/testapps/SimpleApp/Views/Home/About.cshtml b/src/MvcPrecompilation/testapps/SimpleApp/Views/Home/About.cshtml similarity index 100% rename from testapps/SimpleApp/Views/Home/About.cshtml rename to src/MvcPrecompilation/testapps/SimpleApp/Views/Home/About.cshtml diff --git a/testapps/SimpleApp/Views/Home/Index.cshtml b/src/MvcPrecompilation/testapps/SimpleApp/Views/Home/Index.cshtml similarity index 100% rename from testapps/SimpleApp/Views/Home/Index.cshtml rename to src/MvcPrecompilation/testapps/SimpleApp/Views/Home/Index.cshtml diff --git a/testapps/SimpleApp/Views/Shared/_Layout.cshtml b/src/MvcPrecompilation/testapps/SimpleApp/Views/Shared/_Layout.cshtml similarity index 100% rename from testapps/SimpleApp/Views/Shared/_Layout.cshtml rename to src/MvcPrecompilation/testapps/SimpleApp/Views/Shared/_Layout.cshtml diff --git a/testapps/SimpleApp/Views/_ViewImports.cshtml b/src/MvcPrecompilation/testapps/SimpleApp/Views/_ViewImports.cshtml similarity index 100% rename from testapps/SimpleApp/Views/_ViewImports.cshtml rename to src/MvcPrecompilation/testapps/SimpleApp/Views/_ViewImports.cshtml diff --git a/testapps/SimpleApp/Views/_ViewStart.cshtml b/src/MvcPrecompilation/testapps/SimpleApp/Views/_ViewStart.cshtml similarity index 100% rename from testapps/SimpleApp/Views/_ViewStart.cshtml rename to src/MvcPrecompilation/testapps/SimpleApp/Views/_ViewStart.cshtml diff --git a/testapps/SimpleAppWithAssemblyRename/Controllers/HomeController.cs b/src/MvcPrecompilation/testapps/SimpleAppWithAssemblyRename/Controllers/HomeController.cs similarity index 100% rename from testapps/SimpleAppWithAssemblyRename/Controllers/HomeController.cs rename to src/MvcPrecompilation/testapps/SimpleAppWithAssemblyRename/Controllers/HomeController.cs diff --git a/testapps/SimpleAppWithAssemblyRename/Program.cs b/src/MvcPrecompilation/testapps/SimpleAppWithAssemblyRename/Program.cs similarity index 100% rename from testapps/SimpleAppWithAssemblyRename/Program.cs rename to src/MvcPrecompilation/testapps/SimpleAppWithAssemblyRename/Program.cs diff --git a/testapps/SimpleAppWithAssemblyRename/SimpleAppWithAssemblyRename.csproj b/src/MvcPrecompilation/testapps/SimpleAppWithAssemblyRename/SimpleAppWithAssemblyRename.csproj similarity index 100% rename from testapps/SimpleAppWithAssemblyRename/SimpleAppWithAssemblyRename.csproj rename to src/MvcPrecompilation/testapps/SimpleAppWithAssemblyRename/SimpleAppWithAssemblyRename.csproj diff --git a/testapps/SimpleAppWithAssemblyRename/Startup.cs b/src/MvcPrecompilation/testapps/SimpleAppWithAssemblyRename/Startup.cs similarity index 100% rename from testapps/SimpleAppWithAssemblyRename/Startup.cs rename to src/MvcPrecompilation/testapps/SimpleAppWithAssemblyRename/Startup.cs diff --git a/testapps/SimpleAppWithAssemblyRename/Views/Home/Index.cshtml b/src/MvcPrecompilation/testapps/SimpleAppWithAssemblyRename/Views/Home/Index.cshtml similarity index 100% rename from testapps/SimpleAppWithAssemblyRename/Views/Home/Index.cshtml rename to src/MvcPrecompilation/testapps/SimpleAppWithAssemblyRename/Views/Home/Index.cshtml diff --git a/testapps/SimpleAppWithAssemblyRename/Views/_ViewImports.cshtml b/src/MvcPrecompilation/testapps/SimpleAppWithAssemblyRename/Views/_ViewImports.cshtml similarity index 100% rename from testapps/SimpleAppWithAssemblyRename/Views/_ViewImports.cshtml rename to src/MvcPrecompilation/testapps/SimpleAppWithAssemblyRename/Views/_ViewImports.cshtml diff --git a/testapps/StrongNamedApp/Controllers/HomeController.cs b/src/MvcPrecompilation/testapps/StrongNamedApp/Controllers/HomeController.cs similarity index 100% rename from testapps/StrongNamedApp/Controllers/HomeController.cs rename to src/MvcPrecompilation/testapps/StrongNamedApp/Controllers/HomeController.cs diff --git a/testapps/StrongNamedApp/Program.cs b/src/MvcPrecompilation/testapps/StrongNamedApp/Program.cs similarity index 100% rename from testapps/StrongNamedApp/Program.cs rename to src/MvcPrecompilation/testapps/StrongNamedApp/Program.cs diff --git a/testapps/StrongNamedApp/Startup.cs b/src/MvcPrecompilation/testapps/StrongNamedApp/Startup.cs similarity index 100% rename from testapps/StrongNamedApp/Startup.cs rename to src/MvcPrecompilation/testapps/StrongNamedApp/Startup.cs diff --git a/testapps/StrongNamedApp/StrongNamedApp.csproj b/src/MvcPrecompilation/testapps/StrongNamedApp/StrongNamedApp.csproj similarity index 100% rename from testapps/StrongNamedApp/StrongNamedApp.csproj rename to src/MvcPrecompilation/testapps/StrongNamedApp/StrongNamedApp.csproj diff --git a/testapps/StrongNamedApp/Views/Home/Index.cshtml b/src/MvcPrecompilation/testapps/StrongNamedApp/Views/Home/Index.cshtml similarity index 100% rename from testapps/StrongNamedApp/Views/Home/Index.cshtml rename to src/MvcPrecompilation/testapps/StrongNamedApp/Views/Home/Index.cshtml diff --git a/version.props b/src/MvcPrecompilation/version.props similarity index 100% rename from version.props rename to src/MvcPrecompilation/version.props