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

Merge pull request dotnet/aspnetcore-tooling#974 from nguerrera/link-views 

Pass views assembly to linker\n\nCommit migrated from ddb72ebdb1
This commit is contained in:
Kevin Pilch 2019-08-20 13:58:59 -07:00 committed by GitHub
parent cb35a0aa40 e18cc9a776
commit ad0cf9c6e7
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.StaticWebAssets.targets
View File

@ -487,12 +487,12 @@ Copyright (c) .NET Foundation. All rights reserved.
--> -->
<!-- <!--
Called after ComputeRefAssembliesToPublish but before CopyFilesToPublishDirectory - this target is called when Called after ComputeResolvedFilesToPublishList but before CopyFilesToPublishDirectory - this target is called when
publishing the project to get a list of files to the output directory. publishing the project to get a list of files to the output directory.
--> -->
<Target <Target
Name="_StaticWebAssetsComputeFilesToPublish" Name="_StaticWebAssetsComputeFilesToPublish"
AfterTargets="ComputeRefAssembliesToPublish" AfterTargets="ComputeResolvedFilesToPublishList"
DependsOnTargets="ResolveStaticWebAssetsInputs"> DependsOnTargets="ResolveStaticWebAssetsInputs">
<ItemGroup> <ItemGroup>

6
src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
View File

@ -779,18 +779,20 @@ Copyright (c) .NET Foundation. All rights reserved.
</Target> </Target>
<!-- <!--
Called after ComputeFilesToPublish and ComputeRefAssembliesToPublish but before CopyFilesToPublishDirectory - this target is called when Called after ComputeResolvedFilesToPublishList but before CopyFilesToPublishDirectory - this target is called when
publishing the project to get a list of files to the output directory. publishing the project to get a list of files to the output directory.
--> -->
<Target <Target
Name="_RazorComputeFilesToPublish" Name="_RazorComputeFilesToPublish"
AfterTargets="ComputeRefAssembliesToPublish" AfterTargets="ComputeResolvedFilesToPublishList"
Condition="'$(ResolvedRazorCompileToolset)'=='RazorSdk' and '$(RazorCompileOnPublish)'=='true' and '@(RazorGenerate)'!=''"> Condition="'$(ResolvedRazorCompileToolset)'=='RazorSdk' and '$(RazorCompileOnPublish)'=='true' and '@(RazorGenerate)'!=''">
<!-- If we generated an assembly/pdb then include those --> <!-- If we generated an assembly/pdb then include those -->
<ItemGroup> <ItemGroup>
<ResolvedFileToPublish Include="@(RazorIntermediateAssembly)" Condition="'$(CopyBuildOutputToPublishDirectory)'=='true'"> <ResolvedFileToPublish Include="@(RazorIntermediateAssembly)" Condition="'$(CopyBuildOutputToPublishDirectory)'=='true'">
<RelativePath>@(RazorIntermediateAssembly->'%(Filename)%(Extension)')</RelativePath> <RelativePath>@(RazorIntermediateAssembly->'%(Filename)%(Extension)')</RelativePath>
<!-- Pass assembly to linker and crossgen -->
<PostprocessAssembly>true</PostprocessAssembly>
</ResolvedFileToPublish> </ResolvedFileToPublish>
<ResolvedFileToPublish Include="@(_RazorDebugSymbolsIntermediatePath)" Condition="'$(CopyOutputSymbolsToPublishDirectory)'=='true'"> <ResolvedFileToPublish Include="@(_RazorDebugSymbolsIntermediatePath)" Condition="'$(CopyOutputSymbolsToPublishDirectory)'=='true'">
<RelativePath>@(_RazorDebugSymbolsIntermediatePath->'%(Filename)%(Extension)')</RelativePath> <RelativePath>@(_RazorDebugSymbolsIntermediatePath->'%(Filename)%(Extension)')</RelativePath>