Update Razor SDK packing logic to not include Pack at properties layer.

- We now rely on the Razor source inputs layer to add packing to cshtml content items.

#2378
This commit is contained in:
N. Taylor Mullen 2018-06-19 12:31:35 -07:00
parent 17e3aa8ee4
commit 620105cc5e
2 changed files with 8 additions and 4 deletions

View File

@ -67,10 +67,7 @@ Copyright (c) .NET Foundation. All rights reserved.
</PropertyGroup>
<ItemGroup Condition="'$(EnableDefaultItems)' == 'true' And '$(EnableDefaultContentItems)' == 'true'">
<Content Include="**\*.cshtml" CopyToPublishDirectory="PreserveNewest" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder);$(DefaultWebContentItemExcludes)">
<Pack>$(IncludeRazorContentInPack)</Pack>
</Content>
<Content Include="**\*.cshtml" CopyToPublishDirectory="PreserveNewest" Exclude="$(DefaultItemExcludes);$(DefaultExcludesInProjectFolder);$(DefaultWebContentItemExcludes)" />
<None Remove="**\*.cshtml" />
</ItemGroup>

View File

@ -326,6 +326,13 @@ Copyright (c) .NET Foundation. All rights reserved.
<Content Condition="'%(Content.Extension)'=='.cshtml'" CopyToPublishDirectory="Never" />
</ItemGroup>
<ItemGroup Condition="
'$(ResolvedRazorCompileToolset)'=='RazorSdk' and
'$(EnableDefaultRazorGenerateItems)'=='true'">
<Content Condition="'%(Content.Extension)'=='.cshtml'" Pack="$(IncludeRazorContentInPack)" />
</ItemGroup>
</Target>
<Target Name="AssignRazorGenerateTargetPaths" Condition="'@(RazorGenerate)' != ''">