From e18cc9a77679f7b07c39a7281bd8d4e4f29c8fd4 Mon Sep 17 00:00:00 2001
From: Nick Guerrera <nicholg@microsoft.com>
Date: Wed, 14 Aug 2019 18:44:17 -0700
Subject: [PATCH] Pass views assembly to linker

1. Re-schedule target to run before linker
2. Add additional linker input item
\n\nCommit migrated from https://github.com/dotnet/aspnetcore-tooling/commit/88b5f29a63065857e51cbef659fb9c98e29b5df1
---
 .../Microsoft.NET.Sdk.Razor.StaticWebAssets.targets         | 4 ++--
 .../build/netstandard2.0/Sdk.Razor.CurrentVersion.targets   | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.StaticWebAssets.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.StaticWebAssets.targets
index e90aac13f8..a200ec63ab 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.StaticWebAssets.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.StaticWebAssets.targets
@@ -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.
   -->
   <Target
     Name="_StaticWebAssetsComputeFilesToPublish"
-    AfterTargets="ComputeRefAssembliesToPublish"
+    AfterTargets="ComputeResolvedFilesToPublishList"
     DependsOnTargets="ResolveStaticWebAssetsInputs">
 
     <ItemGroup>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
index e001d5f5da..b0b8683454 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Sdk.Razor.CurrentVersion.targets
@@ -779,18 +779,20 @@ Copyright (c) .NET Foundation. All rights reserved.
   </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.
   -->
   <Target
     Name="_RazorComputeFilesToPublish"
-    AfterTargets="ComputeRefAssembliesToPublish"
+    AfterTargets="ComputeResolvedFilesToPublishList"
     Condition="'$(ResolvedRazorCompileToolset)'=='RazorSdk' and '$(RazorCompileOnPublish)'=='true' and '@(RazorGenerate)'!=''">
 
     <!-- If we generated an assembly/pdb then include those -->
     <ItemGroup>
       <ResolvedFileToPublish Include="@(RazorIntermediateAssembly)" Condition="'$(CopyBuildOutputToPublishDirectory)'=='true'">
         <RelativePath>@(RazorIntermediateAssembly->'%(Filename)%(Extension)')</RelativePath>
+        <!-- Pass assembly to linker and crossgen -->
+        <PostprocessAssembly>true</PostprocessAssembly>
       </ResolvedFileToPublish>
       <ResolvedFileToPublish Include="@(_RazorDebugSymbolsIntermediatePath)" Condition="'$(CopyOutputSymbolsToPublishDirectory)'=='true'">
         <RelativePath>@(_RazorDebugSymbolsIntermediatePath->'%(Filename)%(Extension)')</RelativePath>