From 3e449ec3dea8c4fdf3ab2cb0b057d5d67f324ac8 Mon Sep 17 00:00:00 2001 From: Ryan Nowak Date: Wed, 14 Feb 2018 10:25:21 -0800 Subject: [PATCH 1/2] Update KoreBuild and deps --- build/dependencies.props | 28 ++++++++++++++-------------- korebuild-lock.txt | 4 ++-- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 32429c1cb7..314473ee57 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,21 +4,21 @@ 0.10.11 - 2.1.0-preview1-1012 - 2.1.0-preview1-28193 - 2.1.0-preview1-28193 - 2.1.0-preview1-28193 - 15.3.409 - 15.3.409 + 2.1.0-preview1-1025 + 2.1.0-preview1-28274 + 2.1.0-preview1-28274 + 2.1.0-preview1-28274 + 15.7.0-preview-000010-1365343 + 15.7.0-preview-000010-1365343 2.6.1 2.6.1 - 2.1.0-preview1-28193 - 2.1.0-preview1-28193 - 2.1.0-preview2-25711-01 - 2.1.0-preview1-28193 - 2.1.0-preview1-28193 + 2.1.0-preview1-28274 + 2.1.0-preview1-28274 + 2.1.0-preview1-26208-06 + 2.1.0-preview1-28274 + 2.1.0-preview1-28274 2.0.0 - 2.1.0-preview1-26122-01 + 2.1.0-preview1-26208-06 15.3.0 15.0.26606 15.6.161-preview @@ -38,8 +38,8 @@ 2.0.1 10.0.1 1.1.92 - 4.5.0-preview1-26119-06 - 4.5.0-preview1-26119-06 + 4.5.0-preview1-26208-08 + 4.5.0-preview1-26208-08 9.0.1 2.7.0-beta3-62512-06 2.7.0-beta3-62512-06 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index bc9c05011f..46abcdc657 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.1.0-preview1-1012 -commithash:692d90ec605e64b329e04480d81d3a551536973b +version:2.1.0-preview1-1025 +commithash:5111f89ef43885db3dcf81cefc84e2a1d6715b73 From 02200d4c11907b094dc5441ac8461acf0e94e538 Mon Sep 17 00:00:00 2001 From: Ryan Nowak Date: Mon, 29 Jan 2018 11:41:42 -0800 Subject: [PATCH 2/2] Integrate new WebSDK One of these tests had to be updated and split into two because the expectations of the test weren't totally right. I also logged https://github.com/aspnet/Razor/issues/1986 during this, we didn't consider the impact of putting this logic in the WebSDK on class library. --- .../IntegrationTests/PublishIntegrationTest.cs | 18 ++++++++++++++++-- .../AppWithP2PReference.csproj | 3 --- test/testapps/ClassLibrary/ClassLibrary.csproj | 4 ++-- test/testapps/SimpleMvc/SimpleMvc.csproj | 3 --- test/testapps/SimplePages/SimplePages.csproj | 3 --- 5 files changed, 18 insertions(+), 13 deletions(-) diff --git a/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/PublishIntegrationTest.cs b/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/PublishIntegrationTest.cs index 6089d6f378..6b80b97be6 100644 --- a/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/PublishIntegrationTest.cs +++ b/test/Microsoft.AspNetCore.Razor.Design.Test/IntegrationTests/PublishIntegrationTest.cs @@ -74,14 +74,28 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests Assert.FileCountEquals(result, 0, Path.Combine(PublishOutputPath, "Views"), "*.cshtml"); } - [Fact] + [Fact] // This will use the old precompilation tool, RazorSDK shouldn't get involved. [InitializeTestProject("SimpleMvc")] - public async Task Publish_WithMvcRazorCompileOnPublish_PublishesAssembly() + public async Task Publish_WithMvcRazorCompileOnPublish_Noops() { var result = await DotnetMSBuild("Publish", "/p:MvcRazorCompileOnPublish=true"); Assert.BuildPassed(result); + Assert.FileExists(result, PublishOutputPath, "SimpleMvc.dll"); + Assert.FileExists(result, PublishOutputPath, "SimpleMvc.pdb"); + Assert.FileDoesNotExist(result, PublishOutputPath, "SimpleMvc.PrecompiledViews.dll"); + Assert.FileDoesNotExist(result, PublishOutputPath, "SimpleMvc.PrecompiledViews.pdb"); + } + + [Fact] // This is an override to force the new toolset + [InitializeTestProject("SimpleMvc")] + public async Task Publish_WithMvcRazorCompileOnPublish_AndRazorSDK_PublishesAssembly() + { + var result = await DotnetMSBuild("Publish", "/p:MvcRazorCompileOnPublish=true /p:ResolvedRazorCompileToolset=RazorSDK"); + + Assert.BuildPassed(result); + Assert.FileDoesNotExist(result, OutputPath, "SimpleMvc.PrecompiledViews.dll"); Assert.FileDoesNotExist(result, OutputPath, "SimpleMvc.PrecompiledViews.pdb"); diff --git a/test/testapps/AppWithP2PReference/AppWithP2PReference.csproj b/test/testapps/AppWithP2PReference/AppWithP2PReference.csproj index 82ba010fe7..ee3aa0f554 100644 --- a/test/testapps/AppWithP2PReference/AppWithP2PReference.csproj +++ b/test/testapps/AppWithP2PReference/AppWithP2PReference.csproj @@ -1,9 +1,6 @@ netcoreapp2.0 - - - RazorSDK diff --git a/test/testapps/ClassLibrary/ClassLibrary.csproj b/test/testapps/ClassLibrary/ClassLibrary.csproj index 18338f29d2..13f82dd665 100644 --- a/test/testapps/ClassLibrary/ClassLibrary.csproj +++ b/test/testapps/ClassLibrary/ClassLibrary.csproj @@ -2,8 +2,8 @@ netcoreapp2.0 - - RazorSDK + + RazorSDK diff --git a/test/testapps/SimpleMvc/SimpleMvc.csproj b/test/testapps/SimpleMvc/SimpleMvc.csproj index 11dac1b1da..91bf7e583a 100644 --- a/test/testapps/SimpleMvc/SimpleMvc.csproj +++ b/test/testapps/SimpleMvc/SimpleMvc.csproj @@ -1,9 +1,6 @@ netcoreapp2.0 - - - RazorSDK diff --git a/test/testapps/SimplePages/SimplePages.csproj b/test/testapps/SimplePages/SimplePages.csproj index 11dac1b1da..91bf7e583a 100644 --- a/test/testapps/SimplePages/SimplePages.csproj +++ b/test/testapps/SimplePages/SimplePages.csproj @@ -1,9 +1,6 @@ netcoreapp2.0 - - - RazorSDK