From 03ac95f086bc18e82f009c6397508983fa760107 Mon Sep 17 00:00:00 2001
From: Steve Sanderson <SteveSandersonMS@users.noreply.github.com>
Date: Fri, 16 Mar 2018 09:13:48 +0000
Subject: [PATCH] A better fix for the VS publishing hosted projects issue
 (#274)

---
 .../targets/Blazor.MonoRuntime.targets        | 45 ++++++++++++++++---
 .../targets/Publish.targets                   |  4 +-
 2 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/src/Microsoft.AspNetCore.Blazor.Build/targets/Blazor.MonoRuntime.targets b/src/Microsoft.AspNetCore.Blazor.Build/targets/Blazor.MonoRuntime.targets
index 7c8b761aa7..93a95d2b53 100644
--- a/src/Microsoft.AspNetCore.Blazor.Build/targets/Blazor.MonoRuntime.targets
+++ b/src/Microsoft.AspNetCore.Blazor.Build/targets/Blazor.MonoRuntime.targets
@@ -24,6 +24,13 @@
       <FileWrites Include="@(BlazorItemOutput->'%(TargetOutputPath)')" />
     </ItemGroup>
   </Target>
+  
+  <Target Name="_BlazorTrackResolveReferencesDidRun" AfterTargets="ResolveReferences">
+    <PropertyGroup>
+      <!-- So we know we can trust @(ReferenceCopyLocalPaths) later -->
+      <_BlazorResolveReferencesDidRun>true</_BlazorResolveReferencesDidRun>
+    </PropertyGroup>  
+  </Target>
 
   <Target Name="_BlazorBuildReport"
           AfterTargets="_BlazorCopyFilesToOutputDirectory">
@@ -128,6 +135,9 @@
     for the mono linker.
     /obj/<<configuration>>/<<targetframework>>/blazor/inputs.basic.cache <- This is the marker file to track the inputs common
     inputs to the output generation process.
+    /obj/<<configuration>>/<<targetframework>>/blazor/inputs.copylocal.txt <- Paths to all the copy-local referenced assemblies found
+    during the build process (i.e., the @(ReferenceCopyLocalPaths) values). We need this because when publishing, the build doesn't
+    necessarily also run so this is the only way we know which assemblies to include in linking/resolveassemblies.
     /obj/<<configuration>>/<<targetframework>>/blazor/inputs.linkerswitch.cache <- This is the marker file to track the
     switch from linking to not linking and viceversa.
     /obj/<<configuration>>/<<targetframework>>/blazor/inputs.linker.cache <- This is the marker file to track the inputs
@@ -187,6 +197,9 @@
       <!-- /obj/<<configuration>>/<<targetframework>>/blazor/inputs.basic.cache -->
       <BlazorBuildCommonInputsCache>$(BlazorIntermediateOutputPath)inputs.basic.cache</BlazorBuildCommonInputsCache>
 
+      <!-- /obj/<<configuration>>/<<targetframework>>/blazor/inputs.copylocal.txt -->
+      <BlazorLocalReferencesOutputPath>$(BlazorIntermediateOutputPath)inputs.copylocal.txt</BlazorLocalReferencesOutputPath>
+      
       <!-- /obj/<<configuration>>/<<targetframework>>/blazor/inputs.linkerswitch.cache -->
       <BlazorBuildLinkerSwitchInputsCache>$(BlazorIntermediateOutputPath)inputs.linkerswitch.cache</BlazorBuildLinkerSwitchInputsCache>
 
@@ -231,10 +244,21 @@
   </Target>
 
   <Target Name="_DefineBlazorCommonInputs">
+    <!-- If ResolveReferences hasn't yet run, we must be inside a VS publish process
+         that doesn't also do a build, so use the stored information. -->
+    <ReadLinesFromFile
+      Condition="'$(_BlazorResolveReferencesDidRun)'!='true'"
+      File="$(BlazorLocalReferencesOutputPath)">
+      <Output TaskParameter="Lines" ItemName="_BlazorDependencyInput"/>
+    </ReadLinesFromFile>
+    <ItemGroup Condition="'$(_BlazorResolveReferencesDidRun)'=='true'">
+      <!-- ... otherwise we can get the fresh info from @(ReferenceCopyLocalPaths) -->
+      <_BlazorDependencyInput Include="@(ReferenceCopyLocalPaths->WithMetadataValue('Extension','.dll')->'%(FullPath)')" />
+    </ItemGroup>
 
     <ItemGroup>
       <_BlazorCommonInput Include="@(IntermediateAssembly)" />
-      <_BlazorCommonInput Include="@(ReferenceCopyLocalPaths->WithMetadataValue('Extension','.dll'))" />
+      <_BlazorCommonInput Include="@(_BlazorDependencyInput)" />
       <_BlazorCommonInput Include="$(_BlazorShouldLinkApplicationAssemblies)" />
       <_BlazorLinkingOption Condition="_BlazorShouldLinkApplicationAssemblies == ''" Include="false" />
       <_BlazorLinkingOption Condition="_BlazorShouldLinkApplicationAssemblies != ''" Include="true" />
@@ -249,6 +273,12 @@
       File="$(BlazorBuildCommonInputsCache)"
       Overwrite="True"
       WriteOnlyWhenDifferent="True" />
+    
+    <WriteLinesToFile
+      Lines="@(_BlazorDependencyInput)"
+      File="$(BlazorLocalReferencesOutputPath)"
+      Overwrite="True"
+      WriteOnlyWhenDifferent="True" />
 
     <!-- Switch to detect when we switch from linking to not linking and viceversa -->
     <WriteLinesToFile
@@ -260,6 +290,7 @@
     <ItemGroup>
       <FileWrites Include="$(BlazorBuildLinkerSwitchInputsCache)" />
       <FileWrites Include="$(BlazorBuildCommonInputsCache)" />
+      <FileWrites Include="$(BlazorLocalReferencesOutputPath)" />
     </ItemGroup>
 
   </Target>
@@ -337,7 +368,7 @@
 
     <ItemGroup>
       <_BlazorLinkerInput Include="@(IntermediateAssembly)" />
-      <_BlazorLinkerInput Include="@(ReferenceCopyLocalPaths->WithMetadataValue('Extension','.dll'))" />
+      <_BlazorLinkerInput Include="@(_BlazorDependencyInput)" />
       <_BlazorLinkerInput Include="@(BlazorLinkerDescriptor)" />
       <_BlazorLinkerInput Include="$(AdditionalLinkerOptions)" />
     </ItemGroup>
@@ -363,7 +394,7 @@
       Condition="$(_BlazorShouldLinkApplicationAssemblies) != ''"
       Inputs="$(BlazorBuildLinkerInputsCache);
               @(IntermediateAssembly);
-              @(ReferenceCopyLocalPaths->WithMetadataValue('Extension','.dll'));
+              @(_BlazorDependencyInput);
               @(BlazorLinkerDescriptor)"
       Outputs="$(BlazorIntermediateLinkerResultFilePath)"
     >
@@ -380,7 +411,7 @@
     4) Add the file we just created to the list of file writes, to support incremental builds.
     -->
     <ItemGroup>
-      <_BlazorAssembliesToLink Include="@(ReferenceCopyLocalPaths->WithMetadataValue('Extension','.dll')->'-a &quot;%(FullPath)&quot;')" />
+      <_BlazorAssembliesToLink Include="@(_BlazorDependencyInput->'-a &quot;%(Identity)&quot;')" />
       <_BlazorAssembliesToLink Include="@(IntermediateAssembly->'-a &quot;%(FullPath)&quot;')" />
       <_BlazorFolderLookupPaths Include="@(MonoBaseClassLibraryFolder->'-d &quot;%(Identity)&quot;')" />
       <_BlazorAssemblyDescriptorFiles
@@ -469,11 +500,11 @@
     Condition="'$(_BlazorShouldLinkApplicationAssemblies)' == ''"
     Inputs="$(BlazorBuildCommonInputsCache);
             @(IntermediateAssembly);
-            @(ReferenceCopyLocalPaths->WithMetadataValue('Extension','.dll'))"
+            @(_BlazorDependencyInput)"
     Outputs="$(BlazorResolvedAssembliesOutputPath)"
   >
     <ItemGroup>
-      <_DependenciesParameter Include="@(ReferenceCopyLocalPaths->WithMetadataValue('Extension','.dll')->'--reference &quot;%(FullPath)&quot;')" />
+      <_DependenciesParameter Include="@(_BlazorDependencyInput->'--reference &quot;%(Identity)&quot;')" />
     </ItemGroup>
     <PropertyGroup>
       <_BclParameter>--base-class-library &quot;$(MonoBaseClassLibraryPath)&quot; --base-class-library &quot;$(MonoBaseClassLibraryFacadesPath)&quot;</_BclParameter>
@@ -564,7 +595,7 @@
       <_CssReferences Include="@(BlazorPackageCssRef->'_content/%(SourcePackage)/%(RecursiveDir)%(FileName)%(Extension)')" />
     </ItemGroup>
 
-    <Exec Command="$(BlazorBuildExe) build @(IntermediateAssembly) --html-page &quot;$(BlazorIndexHtml)&quot; @(_AppReferences->'--reference %(Identity)', ' ') @(_JsReferences->'--js %(Identity)', ' ') @(_CssReferences->'--css %(Identity)', ' ') --output &quot;$(BlazorIndexHtmlOutputPath)&quot;" />
+    <Exec Command="$(BlazorBuildExe) build @(IntermediateAssembly) --html-page &quot;$(BlazorIndexHtml)&quot; @(_AppReferences->'--reference &quot;%(Identity)&quot;', ' ') @(_JsReferences->'--js &quot;%(Identity)&quot;', ' ') @(_CssReferences->'--css &quot;%(Identity)&quot;', ' ') --output &quot;$(BlazorIndexHtmlOutputPath)&quot;" />
 
     <ItemGroup Condition="Exists('$(BlazorIndexHtmlOutputPath)')">
       <_BlazorIndex Include="$(BlazorIndexHtmlOutputPath)" />
diff --git a/src/Microsoft.AspNetCore.Blazor.Build/targets/Publish.targets b/src/Microsoft.AspNetCore.Blazor.Build/targets/Publish.targets
index 70a58d91b0..9d797145b7 100644
--- a/src/Microsoft.AspNetCore.Blazor.Build/targets/Publish.targets
+++ b/src/Microsoft.AspNetCore.Blazor.Build/targets/Publish.targets
@@ -12,7 +12,9 @@
     <IsWebConfigTransformDisabled>true</IsWebConfigTransformDisabled>
   </PropertyGroup>
 
-  <Target Name="BlazorGetCopyToPublishDirectoryItems" BeforeTargets="GetCopyToPublishDirectoryItems">
+  <Target Name="BlazorGetCopyToPublishDirectoryItems"
+          BeforeTargets="GetCopyToPublishDirectoryItems"
+          DependsOnTargets="PrepareBlazorOutputs">
     <ItemGroup>
       <!-- Don't want to publish the assemblies from the regular 'bin' dir. Instead we publish ones from 'dist'. -->
       <ResolvedAssembliesToPublish Remove="@(ResolvedAssembliesToPublish)" />