huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update to handle changes from Web SDK 

The Web SDK is adding new properties that will make it clear whether
MvcPrecompilation or Razor SDK should be used. This change introduces
the new setting and a workaround until we can get the new SDK
integrated.
This commit is contained in:
Ryan Nowak 2018-01-18 19:25:54 -08:00
parent d69061552f
commit 3a0fa2de36
15 changed files with 45 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation/build/netstandard2.0/Microsoft.AspNetCore.Mvc.Razor.ViewCompilation.targets
View File

@ -166,12 +166,12 @@
Name="_MvcRazorPrecompileOnPublish"
DependsOnTargets="MvcRazorPrecompile"
AfterTargets="PrepareForPublish"
Condition="'$(MvcRazorCompileOnPublish)'=='true'" />
Condition="'$(ResolvedRazorCompileToolset)'=='PrecompilationTool'and '$(MvcRazorCompileOnPublish)'=='true'" />
<Target Name="_MvcRazorResolveFilesToCompute"
AfterTargets="ComputeRefAssembliesToPublish"
DependsOnTargets="_ReportRazorSdkCompatibilityError"
Condition="'$(MvcRazorCompileOnPublish)'=='true'">
Condition="'$(ResolvedRazorCompileToolset)'=='PrecompilationTool'and '$(MvcRazorCompileOnPublish)'=='true'">
<PropertyGroup>
<_MvcRazorOutputPdbFullPath>$([System.IO.Path]::ChangeExtension('$(_MvcRazorOutputFullPath)', '.pdb'))</_MvcRazorOutputPdbFullPath>

3
testapps/ApplicationUsingRelativePaths/ApplicationUsingRelativePaths.csproj
View File

@ -2,6 +2,9 @@
<PropertyGroup>
<TargetFrameworks>$(StandardTestAppTfms)</TargetFrameworks>
<!-- Workaround until we get a new SDK build -->
<ResolvedRazorCompileToolset Condition="'$(RazorCompileToolset)'==''">PrecompilationTool</ResolvedRazorCompileToolset>
<MvcRazorCompileOnPublish>true</MvcRazorCompileOnPublish>
</PropertyGroup>

5
testapps/ApplicationWithConfigureMvc/ApplicationWithConfigureMvc.csproj
View File

@ -2,8 +2,11 @@
<PropertyGroup>
<TargetFrameworks>$(StandardTestAppTfms)</TargetFrameworks>
<MvcRazorCompileOnPublish>true</MvcRazorCompileOnPublish>
<DefineConstants>$(DefineConstants);TEST123</DefineConstants>
<!-- Workaround until we get a new SDK build -->
<ResolvedRazorCompileToolset Condition="'$(RazorCompileToolset)'==''">PrecompilationTool</ResolvedRazorCompileToolset>
<MvcRazorCompileOnPublish>true</MvcRazorCompileOnPublish>
</PropertyGroup>
<ItemGroup>

3
testapps/ApplicationWithCustomInputFiles/ApplicationWithCustomInputFiles.csproj
View File

@ -2,6 +2,9 @@
<PropertyGroup>
<TargetFrameworks>$(StandardTestAppTfms)</TargetFrameworks>
<!-- Workaround until we get a new SDK build -->
<ResolvedRazorCompileToolset Condition="'$(RazorCompileToolset)'==''">PrecompilationTool</ResolvedRazorCompileToolset>
<MvcRazorCompileOnPublish>true</MvcRazorCompileOnPublish>
<MvcRazorEmbedViewSources>true</MvcRazorEmbedViewSources>
</PropertyGroup>

3
testapps/ApplicationWithParseErrors/ApplicationWithParseErrors.csproj
View File

@ -2,6 +2,9 @@
<PropertyGroup>
<TargetFrameworks>$(StandardTestAppTfms)</TargetFrameworks>
<!-- Workaround until we get a new SDK build -->
<ResolvedRazorCompileToolset Condition="'$(RazorCompileToolset)'==''">PrecompilationTool</ResolvedRazorCompileToolset>
<MvcRazorCompileOnPublish>true</MvcRazorCompileOnPublish>
</PropertyGroup>

3
testapps/ApplicationWithRazorSdkNeitherUsed/ApplicationWithRazorSdkNeitherUsed.csproj
View File

@ -3,6 +3,9 @@
<PropertyGroup>
<TargetFrameworks>$(StandardTestAppTfms)</TargetFrameworks>
<!-- Workaround until we get a new SDK build -->
<ResolvedRazorCompileToolset></ResolvedRazorCompileToolset>
<!--
Turning off precompilation on will also turn off Razor SDK.
-->

3
testapps/ApplicationWithRazorSdkPrecompilationUsed/ApplicationWithRazorSdkPrecompilationUsed.csproj
View File

@ -3,6 +3,9 @@
<PropertyGroup>
<TargetFrameworks>$(StandardTestAppTfms)</TargetFrameworks>
<!-- Workaround until we get a new SDK build -->
<ResolvedRazorCompileToolset Condition="'$(RazorCompileToolset)'==''">PrecompilationTool</ResolvedRazorCompileToolset>
<!--
Turning precompilation on will turn off Razor SDK.
-->

6
testapps/ApplicationWithRazorSdkUsed/ApplicationWithRazorSdkUsed.csproj
View File

@ -2,11 +2,11 @@
<PropertyGroup>
<!-- The Web SDK turns this on my default. Setting it back to empty to simulate the 2.1 default -->
<MvcRazorCompileOnPublish></MvcRazorCompileOnPublish>
<TargetFrameworks>$(StandardTestAppTfms)</TargetFrameworks>
<!-- Workaround until we get a new SDK build -->
<ResolvedRazorCompileToolset Condition="'$(RazorCompileToolset)'==''">RazorSDK</ResolvedRazorCompileToolset>
<!-- This will become the default for 2.1 soon -->
<RazorCompileOnPublish>true</RazorCompileOnPublish>

3
testapps/ApplicationWithTagHelpers/ApplicationWithTagHelpers.csproj
View File

@ -2,6 +2,9 @@
<PropertyGroup>
<TargetFrameworks>$(StandardTestAppTfms)</TargetFrameworks>
<!-- Workaround until we get a new SDK build -->
<ResolvedRazorCompileToolset Condition="'$(RazorCompileToolset)'==''">PrecompilationTool</ResolvedRazorCompileToolset>
<MvcRazorCompileOnPublish>true</MvcRazorCompileOnPublish>
</PropertyGroup>

3
testapps/ClassLibraryWithPrecompiledViews/ClassLibraryWithPrecompiledViews.csproj
View File

@ -3,6 +3,9 @@
<PropertyGroup>
<TargetFrameworks>$(StandardTestAppTfms)</TargetFrameworks>
<MvcRazorOutputPath Condition="'$(TargetFramework)'!=''">obj\precompiled\$(TargetFramework)</MvcRazorOutputPath>
<!-- Workaround until we get a new SDK build -->
<ResolvedRazorCompileToolset Condition="'$(RazorCompileToolset)'==''">PrecompilationTool</ResolvedRazorCompileToolset>
<TestIncludeViewCompilationTargets>true</TestIncludeViewCompilationTargets>
</PropertyGroup>

3
testapps/PublishWithEmbedViewSources/PublishWithEmbedViewSources.csproj
View File

@ -2,6 +2,9 @@
<PropertyGroup>
<TargetFrameworks>$(StandardTestAppTfms)</TargetFrameworks>
<!-- Workaround until we get a new SDK build -->
<ResolvedRazorCompileToolset Condition="'$(RazorCompileToolset)'==''">PrecompilationTool</ResolvedRazorCompileToolset>
<MvcRazorCompileOnPublish>true</MvcRazorCompileOnPublish>
<MvcRazorEmbedViewSources>true</MvcRazorEmbedViewSources>
</PropertyGroup>

3
testapps/RazorPagesApp/RazorPagesApp.csproj
View File

@ -2,6 +2,9 @@
<PropertyGroup>
<TargetFrameworks>$(StandardTestAppTfms)</TargetFrameworks>
<!-- Workaround until we get a new SDK build -->
<ResolvedRazorCompileToolset Condition="'$(RazorCompileToolset)'==''">PrecompilationTool</ResolvedRazorCompileToolset>
<MvcRazorCompileOnPublish>true</MvcRazorCompileOnPublish>
</PropertyGroup>

3
testapps/SimpleApp/SimpleApp.csproj
View File

@ -3,6 +3,9 @@
<PropertyGroup>
<TargetFrameworks>$(StandardTestAppTfms)</TargetFrameworks>
<RuntimeIdentifiers>win7-x86;debian-x64</RuntimeIdentifiers>
<!-- Workaround until we get a new SDK build -->
<ResolvedRazorCompileToolset Condition="'$(RazorCompileToolset)'==''">PrecompilationTool</ResolvedRazorCompileToolset>
<MvcRazorCompileOnPublish>true</MvcRazorCompileOnPublish>
</PropertyGroup>

3
testapps/SimpleAppWithAssemblyRename/SimpleAppWithAssemblyRename.csproj
View File

@ -3,6 +3,9 @@
<PropertyGroup>
<AssemblyName>NewAssemblyName</AssemblyName>
<TargetFrameworks>$(StandardTestAppTfms)</TargetFrameworks>
<!-- Workaround until we get a new SDK build -->
<ResolvedRazorCompileToolset Condition="'$(RazorCompileToolset)'==''">PrecompilationTool</ResolvedRazorCompileToolset>
<MvcRazorCompileOnPublish>true</MvcRazorCompileOnPublish>
</PropertyGroup>

3
testapps/StrongNamedApp/StrongNamedApp.csproj
View File

@ -4,6 +4,9 @@
<TargetFrameworks>$(StandardTestAppTfms)</TargetFrameworks>
<SignAssembly>true</SignAssembly>
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
<!-- Workaround until we get a new SDK build -->
<ResolvedRazorCompileToolset Condition="'$(RazorCompileToolset)'==''">PrecompilationTool</ResolvedRazorCompileToolset>
<MvcRazorCompileOnPublish>true</MvcRazorCompileOnPublish>
</PropertyGroup>