From a9494214faf00e9817d134b9fce6a4f033df10a7 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Tue, 17 Mar 2020 16:19:19 -0700
Subject: [PATCH 1/6] Preserve files being published to the publish root and
 the wwwroot

Fixes https://github.com/dotnet/aspnetcore/issues/19926
---
 ...etCore.Components.WebAssembly.Build.nuspec |  1 +
 .../src/ReferenceBlazorBuildFromSource.props  |  5 +-
 ...NetCore.Components.WebAssembly.Build.props |  4 ++
 ...tCore.Components.WebAssembly.Build.targets |  4 ++
 .../targets/StaticWebAssetsWokarounds.targets | 47 +++++++++++++++++++
 .../PublishIntegrationTest.cs                 |  4 ++
 .../Build/testassets/blazorhosted/Program.cs  |  1 +
 .../blazorhosted/blazorhosted.csproj          |  4 ++
 .../testassets/razorclasslibrary/RCLTest.cs   |  4 ++
 .../Build/testassets/standalone/Program.cs    |  2 +-
 ...ponentsWebAssembly-CSharp.Client.csproj.in |  2 +-
 11 files changed, 74 insertions(+), 4 deletions(-)
 create mode 100644 src/Components/WebAssembly/Build/src/buildTransitive/netstandard1.0/Microsoft.AspNetCore.Components.WebAssembly.Build.targets
 create mode 100644 src/Components/WebAssembly/Build/src/targets/StaticWebAssetsWokarounds.targets
 create mode 100644 src/Components/WebAssembly/Build/testassets/razorclasslibrary/RCLTest.cs

diff --git a/src/Components/WebAssembly/Build/src/Microsoft.AspNetCore.Components.WebAssembly.Build.nuspec b/src/Components/WebAssembly/Build/src/Microsoft.AspNetCore.Components.WebAssembly.Build.nuspec
index 65f6ddb98f..95b56065b2 100644
--- a/src/Components/WebAssembly/Build/src/Microsoft.AspNetCore.Components.WebAssembly.Build.nuspec
+++ b/src/Components/WebAssembly/Build/src/Microsoft.AspNetCore.Components.WebAssembly.Build.nuspec
@@ -10,6 +10,7 @@
     $CommonFileElements$
     <file src="..\..\..\THIRD-PARTY-NOTICES.txt" />
     <file src="build\**" target="build" />
+    <file src="buildTransitive\**" target="buildTransitive" />
     <file src="targets\**" target="targets" />
     <file src="$taskskDir$\**" target="tools/" />
     <file src="..\..\..\Web.JS\dist\$configuration$\blazor.webassembly.js" target="tools/blazor" />
diff --git a/src/Components/WebAssembly/Build/src/ReferenceBlazorBuildFromSource.props b/src/Components/WebAssembly/Build/src/ReferenceBlazorBuildFromSource.props
index d480df7f95..be4457dfec 100644
--- a/src/Components/WebAssembly/Build/src/ReferenceBlazorBuildFromSource.props
+++ b/src/Components/WebAssembly/Build/src/ReferenceBlazorBuildFromSource.props
@@ -21,7 +21,8 @@
     <Error Text="blazor.webassembly.js file could not be found at $(_BlazorJsPath)" Condition="!Exists($(_BlazorJsPath))" />
   </Target>
 
-  <Import Project="$(MSBuildThisFileDirectory)targets/All.props" />
-  <Import Project="$(MSBuildThisFileDirectory)targets/All.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)build\netstandard1.0\Microsoft.AspNetCore.Components.WebAssembly.Build.props" />
+  <Import Project="$(MSBuildThisFileDirectory)build\netstandard1.0\Microsoft.AspNetCore.Components.WebAssembly.Build.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)buildTransitive\netstandard1.0\Microsoft.AspNetCore.Components.WebAssembly.Build.targets" />
 
 </Project>
diff --git a/src/Components/WebAssembly/Build/src/build/netstandard1.0/Microsoft.AspNetCore.Components.WebAssembly.Build.props b/src/Components/WebAssembly/Build/src/build/netstandard1.0/Microsoft.AspNetCore.Components.WebAssembly.Build.props
index f20d90334c..a85c05ce87 100644
--- a/src/Components/WebAssembly/Build/src/build/netstandard1.0/Microsoft.AspNetCore.Components.WebAssembly.Build.props
+++ b/src/Components/WebAssembly/Build/src/build/netstandard1.0/Microsoft.AspNetCore.Components.WebAssembly.Build.props
@@ -1,3 +1,7 @@
 <Project>
   <Import Project="$(MSBuildThisFileDirectory)..\..\targets\All.props" />
+
+  <PropertyGroup>
+    <ReferencesComponentsWebAssemblyBuild>true</ReferencesComponentsWebAssemblyBuild>
+  </PropertyGroup>
 </Project>
diff --git a/src/Components/WebAssembly/Build/src/buildTransitive/netstandard1.0/Microsoft.AspNetCore.Components.WebAssembly.Build.targets b/src/Components/WebAssembly/Build/src/buildTransitive/netstandard1.0/Microsoft.AspNetCore.Components.WebAssembly.Build.targets
new file mode 100644
index 0000000000..951d2823b0
--- /dev/null
+++ b/src/Components/WebAssembly/Build/src/buildTransitive/netstandard1.0/Microsoft.AspNetCore.Components.WebAssembly.Build.targets
@@ -0,0 +1,4 @@
+<Project>
+  <Import Project="$(MSBuildThisFileDirectory)..\..\targets\All.targets" Condition="'$(ReferencesComponentsWebAssemblyBuild)' == 'true'" />
+  <Import Project="$(MSBuildThisFileDirectory)..\..\targets\StaticWebAssetsWokarounds.targets" Condition="'$(ReferencesComponentsWebAssemblyBuild)' != 'true'" />
+</Project>
diff --git a/src/Components/WebAssembly/Build/src/targets/StaticWebAssetsWokarounds.targets b/src/Components/WebAssembly/Build/src/targets/StaticWebAssetsWokarounds.targets
new file mode 100644
index 0000000000..141de7cc86
--- /dev/null
+++ b/src/Components/WebAssembly/Build/src/targets/StaticWebAssetsWokarounds.targets
@@ -0,0 +1,47 @@
+<Project>
+  <!--
+    We're attempting to work around a behavior in the Razor SDK with publishing + static web assets for 3.1 applications.
+
+    Some assets such as dlls can appear both as part of a .NET project's publish output as well as the output of the wwwroot. For instance, consider the
+    MyApp.Shared.dll. The target in the RazorSDK: https://github.com/dotnet/aspnetcore-tooling/blob/fae9a5fdbc19edcf5b59a093ce347897a78b0386/src/Razor/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Microsoft.NET.Sdk.Razor.StaticWebAssets.targets#L493-L519
+    unconditionally retargets these items to the wwwroot sub-directory of the publish folder.
+
+    The behavior we want is for these items to appear in both places.
+  -->
+  <Target
+    Name="_BlazorStashStaticWebAssets"
+    BeforeTargets="_StaticWebAssetsComputeFilesToPublish"
+    Condition="'$(RazorSdkSupportPublishingSharedBinaries)' == ''">
+
+    <ItemGroup>
+      <!-- These are all static web assets that are to be copied to the publish output -->
+      <_BlazorExternalPublishStaticWebAssets
+        Include="%(StaticWebAsset.FullPath)"
+        Condition="'%(StaticWebAsset.SourceType)' != ''" />
+
+      <!--
+        We want the intersection of static web assets and ResolvedFilesToPublish that are to be copied to the publish root.
+        _BlazorNonSharedFilesToPublish - set of items that only appear in ResolvedFileToPublish
+        _BlazorSharedFilesToPublish - set of items that appear in both groups are are copied to the publish root.
+      -->
+      <_BlazorNonSharedFilesToPublish Include="@(ResolvedFileToPublish)" Exclude="@(_BlazorExternalPublishStaticWebAssets)" />
+
+      <_BlazorSharedFilesToPublish
+        Include="@(ResolvedFileToPublish)"
+        Exclude="@(_BlazorNonSharedFilesToPublish)"
+        Condition="'%(ResolvedFileToPublish.RelativePath)' == '%(ResolvedFileToPublish.FileName)%(ResolvedFileToPublish.Extension)'"
+        />
+    </ItemGroup>
+  </Target>
+
+  <Target
+    Name="_BlazorUnstashStaticWebAssets"
+    AfterTargets="_StaticWebAssetsComputeFilesToPublish"
+    Condition="'$(RazorSdkSupportPublishingSharedBinaries)' == '' AND '@(_BlazorSharedFilesToPublish->Count())' != '0'">
+
+    <ItemGroup>
+      <ResolvedFileToPublish Include="@(_BlazorSharedFilesToPublish)" />
+    </ItemGroup>
+  </Target>
+
+</Project>
diff --git a/src/Components/WebAssembly/Build/test/BuildIntegrationTests/PublishIntegrationTest.cs b/src/Components/WebAssembly/Build/test/BuildIntegrationTests/PublishIntegrationTest.cs
index c727b1dad5..de01ab9ee5 100644
--- a/src/Components/WebAssembly/Build/test/BuildIntegrationTests/PublishIntegrationTest.cs
+++ b/src/Components/WebAssembly/Build/test/BuildIntegrationTests/PublishIntegrationTest.cs
@@ -198,6 +198,10 @@ namespace Microsoft.AspNetCore.Components.WebAssembly.Build
             Assert.FileExists(result, blazorPublishDirectory, "_framework", "wasm", DotNetJsFileName);
             Assert.FileExists(result, blazorPublishDirectory, "_framework", "_bin", "standalone.dll");
             Assert.FileExists(result, blazorPublishDirectory, "_framework", "_bin", "Microsoft.Extensions.Logging.Abstractions.dll"); // Verify dependencies are part of the output.
+            // Verify project references appear as static web assets
+            Assert.FileExists(result, blazorPublishDirectory, "_framework", "_bin", "RazorClassLibrary.dll");
+            // Also verify project references to the server project appear in the publish output
+            Assert.FileExists(result, publishDirectory, "RazorClassLibrary.dll");
 
             // Verify static assets are in the publish directory
             Assert.FileExists(result, blazorPublishDirectory, "index.html");
diff --git a/src/Components/WebAssembly/Build/testassets/blazorhosted/Program.cs b/src/Components/WebAssembly/Build/testassets/blazorhosted/Program.cs
index e2efcc0c74..b35aacbdcc 100644
--- a/src/Components/WebAssembly/Build/testassets/blazorhosted/Program.cs
+++ b/src/Components/WebAssembly/Build/testassets/blazorhosted/Program.cs
@@ -10,6 +10,7 @@ namespace blazorhosted.Server
         public static void Main(string[] args)
         {
             Console.WriteLine(typeof(IWebHost));
+            Console.WriteLine(typeof(RazorClassLibrary.RCLTest));
         }
     }
 }
diff --git a/src/Components/WebAssembly/Build/testassets/blazorhosted/blazorhosted.csproj b/src/Components/WebAssembly/Build/testassets/blazorhosted/blazorhosted.csproj
index 3b08400ff7..743d8ad48c 100644
--- a/src/Components/WebAssembly/Build/testassets/blazorhosted/blazorhosted.csproj
+++ b/src/Components/WebAssembly/Build/testassets/blazorhosted/blazorhosted.csproj
@@ -6,6 +6,10 @@
 
   <ItemGroup>
     <ProjectReference Include="..\standalone\standalone.csproj" />
+    <ProjectReference Include="..\razorclasslibrary\RazorClassLibrary.csproj" />
   </ItemGroup>
 
+  <!-- Approximating a build transitive reference -->
+  <Import Project="$(BlazorBuildRoot)buildTransitive\netstandard1.0\Microsoft.AspNetCore.Components.WebAssembly.Build.targets" />
+
 </Project>
diff --git a/src/Components/WebAssembly/Build/testassets/razorclasslibrary/RCLTest.cs b/src/Components/WebAssembly/Build/testassets/razorclasslibrary/RCLTest.cs
new file mode 100644
index 0000000000..8f540c8c06
--- /dev/null
+++ b/src/Components/WebAssembly/Build/testassets/razorclasslibrary/RCLTest.cs
@@ -0,0 +1,4 @@
+namespace RazorClassLibrary
+{
+    public class RCLTest {}
+}
diff --git a/src/Components/WebAssembly/Build/testassets/standalone/Program.cs b/src/Components/WebAssembly/Build/testassets/standalone/Program.cs
index 7d2cb4eeea..67b363c346 100644
--- a/src/Components/WebAssembly/Build/testassets/standalone/Program.cs
+++ b/src/Components/WebAssembly/Build/testassets/standalone/Program.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace standalone
 {
diff --git a/src/ProjectTemplates/ComponentsWebAssembly.ProjectTemplates/ComponentsWebAssembly-CSharp.Client.csproj.in b/src/ProjectTemplates/ComponentsWebAssembly.ProjectTemplates/ComponentsWebAssembly-CSharp.Client.csproj.in
index e612662f2d..7135afd82c 100644
--- a/src/ProjectTemplates/ComponentsWebAssembly.ProjectTemplates/ComponentsWebAssembly-CSharp.Client.csproj.in
+++ b/src/ProjectTemplates/ComponentsWebAssembly.ProjectTemplates/ComponentsWebAssembly-CSharp.Client.csproj.in
@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="${MicrosoftAspNetCoreComponentsWebAssemblyPackageVersion}" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="${MicrosoftAspNetCoreComponentsWebAssemblyBuildPackageVersion}" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="${MicrosoftAspNetCoreComponentsWebAssemblyBuildPackageVersion}" IncludeAssets="build;buildTransitive" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="${MicrosoftAspNetCoreComponentsWebAssemblyDevServerPackageVersion}" PrivateAssets="all" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="${MicrosoftAspNetCoreComponentsWebAssemblyAuthenticationPackageVersion}" Condition="'$(IndividualLocalAuth)' == 'true'" />
     <PackageReference Include="Microsoft.Authentication.WebAssembly.Msal" Version="${MicrosoftAuthenticationWebAssemblyMsalPackageVersion}" Condition="'$(OrganizationalAuth)' == 'true' OR '$(IndividualB2CAuth)' == 'true'" />

From 0c614ff9c788e401f681b622305f8ecac7575938 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Tue, 17 Mar 2020 22:06:06 -0700
Subject: [PATCH 2/6] Fixup

---
 .../Build/src/ReferenceBlazorBuildFromSource.props           | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/Components/WebAssembly/Build/src/ReferenceBlazorBuildFromSource.props b/src/Components/WebAssembly/Build/src/ReferenceBlazorBuildFromSource.props
index be4457dfec..d480df7f95 100644
--- a/src/Components/WebAssembly/Build/src/ReferenceBlazorBuildFromSource.props
+++ b/src/Components/WebAssembly/Build/src/ReferenceBlazorBuildFromSource.props
@@ -21,8 +21,7 @@
     <Error Text="blazor.webassembly.js file could not be found at $(_BlazorJsPath)" Condition="!Exists($(_BlazorJsPath))" />
   </Target>
 
-  <Import Project="$(MSBuildThisFileDirectory)build\netstandard1.0\Microsoft.AspNetCore.Components.WebAssembly.Build.props" />
-  <Import Project="$(MSBuildThisFileDirectory)build\netstandard1.0\Microsoft.AspNetCore.Components.WebAssembly.Build.targets" />
-  <Import Project="$(MSBuildThisFileDirectory)buildTransitive\netstandard1.0\Microsoft.AspNetCore.Components.WebAssembly.Build.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)targets/All.props" />
+  <Import Project="$(MSBuildThisFileDirectory)targets/All.targets" />
 
 </Project>

From a7c2d25ffaa0e7a2ce6a7b99a86c8056f7d4f8ed Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Wed, 25 Mar 2020 14:44:46 -0700
Subject: [PATCH 3/6] Remove constraints on WebAssembly.Build package Make
 Blazor-Wasm projects not-packable by default

---
 .../Microsoft.AspNetCore.Components.WebAssembly.Build.props     | 1 +
 .../ComponentsWebAssembly-CSharp.Client.csproj.in               | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Components/WebAssembly/Build/src/build/netstandard1.0/Microsoft.AspNetCore.Components.WebAssembly.Build.props b/src/Components/WebAssembly/Build/src/build/netstandard1.0/Microsoft.AspNetCore.Components.WebAssembly.Build.props
index a85c05ce87..da35c10471 100644
--- a/src/Components/WebAssembly/Build/src/build/netstandard1.0/Microsoft.AspNetCore.Components.WebAssembly.Build.props
+++ b/src/Components/WebAssembly/Build/src/build/netstandard1.0/Microsoft.AspNetCore.Components.WebAssembly.Build.props
@@ -3,5 +3,6 @@
 
   <PropertyGroup>
     <ReferencesComponentsWebAssemblyBuild>true</ReferencesComponentsWebAssemblyBuild>
+    <IsPackable>false</IsPackable>
   </PropertyGroup>
 </Project>
diff --git a/src/ProjectTemplates/ComponentsWebAssembly.ProjectTemplates/ComponentsWebAssembly-CSharp.Client.csproj.in b/src/ProjectTemplates/ComponentsWebAssembly.ProjectTemplates/ComponentsWebAssembly-CSharp.Client.csproj.in
index 7135afd82c..0e627f82ac 100644
--- a/src/ProjectTemplates/ComponentsWebAssembly.ProjectTemplates/ComponentsWebAssembly-CSharp.Client.csproj.in
+++ b/src/ProjectTemplates/ComponentsWebAssembly.ProjectTemplates/ComponentsWebAssembly-CSharp.Client.csproj.in
@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="${MicrosoftAspNetCoreComponentsWebAssemblyPackageVersion}" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="${MicrosoftAspNetCoreComponentsWebAssemblyBuildPackageVersion}" IncludeAssets="build;buildTransitive" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="${MicrosoftAspNetCoreComponentsWebAssemblyBuildPackageVersion}" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="${MicrosoftAspNetCoreComponentsWebAssemblyDevServerPackageVersion}" PrivateAssets="all" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="${MicrosoftAspNetCoreComponentsWebAssemblyAuthenticationPackageVersion}" Condition="'$(IndividualLocalAuth)' == 'true'" />
     <PackageReference Include="Microsoft.Authentication.WebAssembly.Msal" Version="${MicrosoftAuthenticationWebAssemblyMsalPackageVersion}" Condition="'$(OrganizationalAuth)' == 'true' OR '$(IndividualB2CAuth)' == 'true'" />

From 861e88c61b52aab0cedeaa154fc48a21327558d1 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Wed, 25 Mar 2020 15:10:24 -0700
Subject: [PATCH 4/6] Fixup tests

---
 .../PublishIntegrationTest.cs                 | 30 +++++++++++++------
 .../Build/testassets/standalone/Program.cs    |  2 +-
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/Components/WebAssembly/Build/test/BuildIntegrationTests/PublishIntegrationTest.cs b/src/Components/WebAssembly/Build/test/BuildIntegrationTests/PublishIntegrationTest.cs
index de01ab9ee5..c5f8395c7b 100644
--- a/src/Components/WebAssembly/Build/test/BuildIntegrationTests/PublishIntegrationTest.cs
+++ b/src/Components/WebAssembly/Build/test/BuildIntegrationTests/PublishIntegrationTest.cs
@@ -178,12 +178,16 @@ namespace Microsoft.AspNetCore.Components.WebAssembly.Build
         }
 
         [Fact]
-        public async Task Publish_HostedApp_Works()
+        public async Task Publish_HostedApp_WithLinkOnBuildTrue_Works()
         {
             // Arrange
             using var project = ProjectDirectory.Create("blazorhosted", additionalProjects: new[] { "standalone", "razorclasslibrary", });
             project.TargetFramework = "netcoreapp3.1";
             var result = await MSBuildProcessManager.DotnetMSBuild(project, "Publish");
+            AddSiblingProjectFileContent(project, @"
+<PropertyGroup>
+    <BlazorWebAssemblyEnableLinking>true</BlazorWebAssemblyEnableLinking>
+</PropertyGroup>");
 
             Assert.BuildPassed(result);
 
@@ -228,7 +232,7 @@ namespace Microsoft.AspNetCore.Components.WebAssembly.Build
             using var project = ProjectDirectory.Create("blazorhosted", additionalProjects: new[] { "standalone", "razorclasslibrary", });
             project.TargetFramework = "netcoreapp3.1";
 
-            AddSiblingProjectFileContent(@"
+            AddSiblingProjectFileContent(project, @"
 <PropertyGroup>
     <BlazorWebAssemblyEnableLinking>false</BlazorWebAssemblyEnableLinking>
 </PropertyGroup>");
@@ -245,14 +249,21 @@ namespace Microsoft.AspNetCore.Components.WebAssembly.Build
             // Make sure the main project exists
             Assert.FileExists(result, publishDirectory, "blazorhosted.dll");
 
+            // Verification for https://github.com/dotnet/aspnetcore/issues/19926. Verify binaries for projects
+            // referenced by the Hosted project appear in the publish directory
+            Assert.FileExists(result, publishDirectory, "RazorClassLibrary.dll");
+            Assert.FileExists(result, publishDirectory, "standalone.dll");
+
             var blazorPublishDirectory = Path.Combine(publishDirectory, "wwwroot");
             Assert.FileExists(result, blazorPublishDirectory, "_framework", "blazor.boot.json");
             Assert.FileExists(result, blazorPublishDirectory, "_framework", "blazor.webassembly.js");
             Assert.FileExists(result, blazorPublishDirectory, "_framework", "wasm", "dotnet.wasm");
             Assert.FileExists(result, blazorPublishDirectory, "_framework", "wasm", DotNetJsFileName);
             Assert.FileExists(result, blazorPublishDirectory, "_framework", "_bin", "standalone.dll");
+            Assert.FileExists(result, blazorPublishDirectory, "_framework", "_bin", "RazorClassLibrary.dll");
             Assert.FileExists(result, blazorPublishDirectory, "_framework", "_bin", "Microsoft.Extensions.Logging.Abstractions.dll"); // Verify dependencies are part of the output.
 
+
             // Verify static assets are in the publish directory
             Assert.FileExists(result, blazorPublishDirectory, "index.html");
 
@@ -272,14 +283,7 @@ namespace Microsoft.AspNetCore.Components.WebAssembly.Build
                 serviceWorkerContent: "// This is the production service worker",
                 assetsManifestPath: "custom-service-worker-assets.js");
 
-            void AddSiblingProjectFileContent(string content)
-            {
-                var path = Path.Combine(project.SolutionPath, "standalone", "standalone.csproj");
-                var existing = File.ReadAllText(path);
-                var updated = existing.Replace("<!-- Test Placeholder -->", content);
-                File.WriteAllText(path, updated);
             }
-        }
 
         [Fact]
         public async Task Publish_HostedApp_WithNoBuild_Works()
@@ -323,6 +327,14 @@ namespace Microsoft.AspNetCore.Components.WebAssembly.Build
                 assetsManifestPath: "custom-service-worker-assets.js");
         }
 
+        private static void AddSiblingProjectFileContent(ProjectDirectory project, string content)
+        {
+            var path = Path.Combine(project.SolutionPath, "standalone", "standalone.csproj");
+            var existing = File.ReadAllText(path);
+            var updated = existing.Replace("<!-- Test Placeholder -->", content);
+            File.WriteAllText(path, updated);
+        }
+
         private static void VerifyBootManifestHashes(MSBuildResult result, string blazorPublishDirectory)
         {
             var bootManifestResolvedPath = Assert.FileExists(result, blazorPublishDirectory, "_framework", "blazor.boot.json");
diff --git a/src/Components/WebAssembly/Build/testassets/standalone/Program.cs b/src/Components/WebAssembly/Build/testassets/standalone/Program.cs
index 67b363c346..7d2cb4eeea 100644
--- a/src/Components/WebAssembly/Build/testassets/standalone/Program.cs
+++ b/src/Components/WebAssembly/Build/testassets/standalone/Program.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace standalone
 {

From a127eb86dadaf00fc720d62898e5e555be8ecdf3 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Wed, 25 Mar 2020 15:37:49 -0700
Subject: [PATCH 5/6] Fixup

---
 ...etCore.Components.WebAssembly.Build.nuspec |  1 -
 ...NetCore.Components.WebAssembly.Build.props |  1 -
 ...tCore.Components.WebAssembly.Build.targets |  4 --
 .../src/targets/Blazor.MonoRuntime.targets    | 21 ++++++++-
 .../targets/StaticWebAssetsWokarounds.targets | 47 -------------------
 .../PublishIntegrationTest.cs                 |  2 +-
 .../Build/testassets/blazorhosted/Program.cs  |  2 +-
 .../blazorhosted/blazorhosted.csproj          |  3 --
 .../testassets/razorclasslibrary/RCLTest.cs   |  4 --
 ...ponentsWebAssembly-CSharp.Client.csproj.in |  2 +-
 10 files changed, 23 insertions(+), 64 deletions(-)
 delete mode 100644 src/Components/WebAssembly/Build/src/buildTransitive/netstandard1.0/Microsoft.AspNetCore.Components.WebAssembly.Build.targets
 delete mode 100644 src/Components/WebAssembly/Build/src/targets/StaticWebAssetsWokarounds.targets
 delete mode 100644 src/Components/WebAssembly/Build/testassets/razorclasslibrary/RCLTest.cs

diff --git a/src/Components/WebAssembly/Build/src/Microsoft.AspNetCore.Components.WebAssembly.Build.nuspec b/src/Components/WebAssembly/Build/src/Microsoft.AspNetCore.Components.WebAssembly.Build.nuspec
index 95b56065b2..65f6ddb98f 100644
--- a/src/Components/WebAssembly/Build/src/Microsoft.AspNetCore.Components.WebAssembly.Build.nuspec
+++ b/src/Components/WebAssembly/Build/src/Microsoft.AspNetCore.Components.WebAssembly.Build.nuspec
@@ -10,7 +10,6 @@
     $CommonFileElements$
     <file src="..\..\..\THIRD-PARTY-NOTICES.txt" />
     <file src="build\**" target="build" />
-    <file src="buildTransitive\**" target="buildTransitive" />
     <file src="targets\**" target="targets" />
     <file src="$taskskDir$\**" target="tools/" />
     <file src="..\..\..\Web.JS\dist\$configuration$\blazor.webassembly.js" target="tools/blazor" />
diff --git a/src/Components/WebAssembly/Build/src/build/netstandard1.0/Microsoft.AspNetCore.Components.WebAssembly.Build.props b/src/Components/WebAssembly/Build/src/build/netstandard1.0/Microsoft.AspNetCore.Components.WebAssembly.Build.props
index da35c10471..a85c05ce87 100644
--- a/src/Components/WebAssembly/Build/src/build/netstandard1.0/Microsoft.AspNetCore.Components.WebAssembly.Build.props
+++ b/src/Components/WebAssembly/Build/src/build/netstandard1.0/Microsoft.AspNetCore.Components.WebAssembly.Build.props
@@ -3,6 +3,5 @@
 
   <PropertyGroup>
     <ReferencesComponentsWebAssemblyBuild>true</ReferencesComponentsWebAssemblyBuild>
-    <IsPackable>false</IsPackable>
   </PropertyGroup>
 </Project>
diff --git a/src/Components/WebAssembly/Build/src/buildTransitive/netstandard1.0/Microsoft.AspNetCore.Components.WebAssembly.Build.targets b/src/Components/WebAssembly/Build/src/buildTransitive/netstandard1.0/Microsoft.AspNetCore.Components.WebAssembly.Build.targets
deleted file mode 100644
index 951d2823b0..0000000000
--- a/src/Components/WebAssembly/Build/src/buildTransitive/netstandard1.0/Microsoft.AspNetCore.Components.WebAssembly.Build.targets
+++ /dev/null
@@ -1,4 +0,0 @@
-<Project>
-  <Import Project="$(MSBuildThisFileDirectory)..\..\targets\All.targets" Condition="'$(ReferencesComponentsWebAssemblyBuild)' == 'true'" />
-  <Import Project="$(MSBuildThisFileDirectory)..\..\targets\StaticWebAssetsWokarounds.targets" Condition="'$(ReferencesComponentsWebAssemblyBuild)' != 'true'" />
-</Project>
diff --git a/src/Components/WebAssembly/Build/src/targets/Blazor.MonoRuntime.targets b/src/Components/WebAssembly/Build/src/targets/Blazor.MonoRuntime.targets
index 2129568bac..c67800da2e 100644
--- a/src/Components/WebAssembly/Build/src/targets/Blazor.MonoRuntime.targets
+++ b/src/Components/WebAssembly/Build/src/targets/Blazor.MonoRuntime.targets
@@ -272,6 +272,14 @@
     <ReadLinesFromFile File="$(_BlazorApplicationAssembliesCacheFile)" Condition="'@(_BlazorResolvedAssembly->Count())' == '0'">
       <Output TaskParameter="Lines" ItemName="_BlazorResolvedAssembly"/>
     </ReadLinesFromFile>
+
+    <ItemGroup>
+      <!--
+        Workaround for https://github.com/dotnet/aspnetcore/issues/19926. Add _BlazorResolvedAssembly to FileWrites so it doesn't
+        get removed during build incremantalism. We cannot do this in _ResolveBlazorRuntimeDependencies since it's incremental.
+       -->
+      <FileWrites Include="$(_BlazorResolvedAssembly)"/>
+    </ItemGroup>
   </Target>
 
   <Target
@@ -291,9 +299,20 @@
       ApplicationDependencies="@(_BlazorManagedRuntimeAssembly)"
       WebAssemblyBCLAssemblies="@(_WebAssemblyBCLAssembly)">
 
-      <Output TaskParameter="Dependencies" ItemName="_BlazorResolvedAssembly" />
+      <Output TaskParameter="Dependencies" ItemName="_BlazorResolvedAssemblyUnlinked" />
     </ResolveBlazorRuntimeDependencies>
 
+    <!--
+    Workaround for https://github.com/dotnet/aspnetcore/issues/19926. Using the files from their inital locations
+    as-is causes RazorSDK to remove files from a hosted app's publish directory. This is because files being removed
+    are looked up by their path. We'll copy files to an intermediate location to trip the removal code.
+    -->
+    <Copy
+      SourceFiles="@(_BlazorResolvedAssemblyUnlinked)"
+      DestinationFolder="$(_BlazorIntermediateOutputPath)unlinked">
+        <Output TaskParameter="CopiedFiles" ItemName="_BlazorResolvedAssembly" />
+    </Copy>
+
     <WriteLinesToFile File="$(_BlazorApplicationAssembliesCacheFile)" Lines="@(_BlazorResolvedAssembly)" Overwrite="true" />
 
     <ItemGroup>
diff --git a/src/Components/WebAssembly/Build/src/targets/StaticWebAssetsWokarounds.targets b/src/Components/WebAssembly/Build/src/targets/StaticWebAssetsWokarounds.targets
deleted file mode 100644
index 141de7cc86..0000000000
--- a/src/Components/WebAssembly/Build/src/targets/StaticWebAssetsWokarounds.targets
+++ /dev/null
@@ -1,47 +0,0 @@
-<Project>
-  <!--
-    We're attempting to work around a behavior in the Razor SDK with publishing + static web assets for 3.1 applications.
-
-    Some assets such as dlls can appear both as part of a .NET project's publish output as well as the output of the wwwroot. For instance, consider the
-    MyApp.Shared.dll. The target in the RazorSDK: https://github.com/dotnet/aspnetcore-tooling/blob/fae9a5fdbc19edcf5b59a093ce347897a78b0386/src/Razor/src/Microsoft.NET.Sdk.Razor/build/netstandard2.0/Microsoft.NET.Sdk.Razor.StaticWebAssets.targets#L493-L519
-    unconditionally retargets these items to the wwwroot sub-directory of the publish folder.
-
-    The behavior we want is for these items to appear in both places.
-  -->
-  <Target
-    Name="_BlazorStashStaticWebAssets"
-    BeforeTargets="_StaticWebAssetsComputeFilesToPublish"
-    Condition="'$(RazorSdkSupportPublishingSharedBinaries)' == ''">
-
-    <ItemGroup>
-      <!-- These are all static web assets that are to be copied to the publish output -->
-      <_BlazorExternalPublishStaticWebAssets
-        Include="%(StaticWebAsset.FullPath)"
-        Condition="'%(StaticWebAsset.SourceType)' != ''" />
-
-      <!--
-        We want the intersection of static web assets and ResolvedFilesToPublish that are to be copied to the publish root.
-        _BlazorNonSharedFilesToPublish - set of items that only appear in ResolvedFileToPublish
-        _BlazorSharedFilesToPublish - set of items that appear in both groups are are copied to the publish root.
-      -->
-      <_BlazorNonSharedFilesToPublish Include="@(ResolvedFileToPublish)" Exclude="@(_BlazorExternalPublishStaticWebAssets)" />
-
-      <_BlazorSharedFilesToPublish
-        Include="@(ResolvedFileToPublish)"
-        Exclude="@(_BlazorNonSharedFilesToPublish)"
-        Condition="'%(ResolvedFileToPublish.RelativePath)' == '%(ResolvedFileToPublish.FileName)%(ResolvedFileToPublish.Extension)'"
-        />
-    </ItemGroup>
-  </Target>
-
-  <Target
-    Name="_BlazorUnstashStaticWebAssets"
-    AfterTargets="_StaticWebAssetsComputeFilesToPublish"
-    Condition="'$(RazorSdkSupportPublishingSharedBinaries)' == '' AND '@(_BlazorSharedFilesToPublish->Count())' != '0'">
-
-    <ItemGroup>
-      <ResolvedFileToPublish Include="@(_BlazorSharedFilesToPublish)" />
-    </ItemGroup>
-  </Target>
-
-</Project>
diff --git a/src/Components/WebAssembly/Build/test/BuildIntegrationTests/PublishIntegrationTest.cs b/src/Components/WebAssembly/Build/test/BuildIntegrationTests/PublishIntegrationTest.cs
index c5f8395c7b..d6bd0613ca 100644
--- a/src/Components/WebAssembly/Build/test/BuildIntegrationTests/PublishIntegrationTest.cs
+++ b/src/Components/WebAssembly/Build/test/BuildIntegrationTests/PublishIntegrationTest.cs
@@ -194,6 +194,7 @@ namespace Microsoft.AspNetCore.Components.WebAssembly.Build
             var publishDirectory = project.PublishOutputDirectory;
             // Make sure the main project exists
             Assert.FileExists(result, publishDirectory, "blazorhosted.dll");
+            Assert.FileExists(result, publishDirectory, "RazorClassLibrary.dll");
 
             var blazorPublishDirectory = Path.Combine(publishDirectory, "wwwroot");
             Assert.FileExists(result, blazorPublishDirectory, "_framework", "blazor.boot.json");
@@ -263,7 +264,6 @@ namespace Microsoft.AspNetCore.Components.WebAssembly.Build
             Assert.FileExists(result, blazorPublishDirectory, "_framework", "_bin", "RazorClassLibrary.dll");
             Assert.FileExists(result, blazorPublishDirectory, "_framework", "_bin", "Microsoft.Extensions.Logging.Abstractions.dll"); // Verify dependencies are part of the output.
 
-
             // Verify static assets are in the publish directory
             Assert.FileExists(result, blazorPublishDirectory, "index.html");
 
diff --git a/src/Components/WebAssembly/Build/testassets/blazorhosted/Program.cs b/src/Components/WebAssembly/Build/testassets/blazorhosted/Program.cs
index b35aacbdcc..a90f4db291 100644
--- a/src/Components/WebAssembly/Build/testassets/blazorhosted/Program.cs
+++ b/src/Components/WebAssembly/Build/testassets/blazorhosted/Program.cs
@@ -10,7 +10,7 @@ namespace blazorhosted.Server
         public static void Main(string[] args)
         {
             Console.WriteLine(typeof(IWebHost));
-            Console.WriteLine(typeof(RazorClassLibrary.RCLTest));
+            GC.KeepAlive(typeof(RazorClassLibrary.Class1));
         }
     }
 }
diff --git a/src/Components/WebAssembly/Build/testassets/blazorhosted/blazorhosted.csproj b/src/Components/WebAssembly/Build/testassets/blazorhosted/blazorhosted.csproj
index 743d8ad48c..af1d77d184 100644
--- a/src/Components/WebAssembly/Build/testassets/blazorhosted/blazorhosted.csproj
+++ b/src/Components/WebAssembly/Build/testassets/blazorhosted/blazorhosted.csproj
@@ -9,7 +9,4 @@
     <ProjectReference Include="..\razorclasslibrary\RazorClassLibrary.csproj" />
   </ItemGroup>
 
-  <!-- Approximating a build transitive reference -->
-  <Import Project="$(BlazorBuildRoot)buildTransitive\netstandard1.0\Microsoft.AspNetCore.Components.WebAssembly.Build.targets" />
-
 </Project>
diff --git a/src/Components/WebAssembly/Build/testassets/razorclasslibrary/RCLTest.cs b/src/Components/WebAssembly/Build/testassets/razorclasslibrary/RCLTest.cs
deleted file mode 100644
index 8f540c8c06..0000000000
--- a/src/Components/WebAssembly/Build/testassets/razorclasslibrary/RCLTest.cs
+++ /dev/null
@@ -1,4 +0,0 @@
-namespace RazorClassLibrary
-{
-    public class RCLTest {}
-}
diff --git a/src/ProjectTemplates/ComponentsWebAssembly.ProjectTemplates/ComponentsWebAssembly-CSharp.Client.csproj.in b/src/ProjectTemplates/ComponentsWebAssembly.ProjectTemplates/ComponentsWebAssembly-CSharp.Client.csproj.in
index 0e627f82ac..e612662f2d 100644
--- a/src/ProjectTemplates/ComponentsWebAssembly.ProjectTemplates/ComponentsWebAssembly-CSharp.Client.csproj.in
+++ b/src/ProjectTemplates/ComponentsWebAssembly.ProjectTemplates/ComponentsWebAssembly-CSharp.Client.csproj.in
@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="${MicrosoftAspNetCoreComponentsWebAssemblyPackageVersion}" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="${MicrosoftAspNetCoreComponentsWebAssemblyBuildPackageVersion}" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="${MicrosoftAspNetCoreComponentsWebAssemblyBuildPackageVersion}" PrivateAssets="all" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="${MicrosoftAspNetCoreComponentsWebAssemblyDevServerPackageVersion}" PrivateAssets="all" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="${MicrosoftAspNetCoreComponentsWebAssemblyAuthenticationPackageVersion}" Condition="'$(IndividualLocalAuth)' == 'true'" />
     <PackageReference Include="Microsoft.Authentication.WebAssembly.Msal" Version="${MicrosoftAuthenticationWebAssemblyMsalPackageVersion}" Condition="'$(OrganizationalAuth)' == 'true' OR '$(IndividualB2CAuth)' == 'true'" />

From 1b2cb0b93cb8d190a69137d54973274907bcdd98 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Thu, 2 Apr 2020 15:02:22 -0700
Subject: [PATCH 6/6] Apply suggestions from code review

Co-Authored-By: Steve Sanderson <SteveSandersonMS@users.noreply.github.com>
---
 .../Build/src/targets/Blazor.MonoRuntime.targets         | 9 +++++----
 .../Build/testassets/blazorhosted/blazorhosted.csproj    | 1 -
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Components/WebAssembly/Build/src/targets/Blazor.MonoRuntime.targets b/src/Components/WebAssembly/Build/src/targets/Blazor.MonoRuntime.targets
index c67800da2e..b0aa8bb89c 100644
--- a/src/Components/WebAssembly/Build/src/targets/Blazor.MonoRuntime.targets
+++ b/src/Components/WebAssembly/Build/src/targets/Blazor.MonoRuntime.targets
@@ -275,8 +275,9 @@
 
     <ItemGroup>
       <!--
-        Workaround for https://github.com/dotnet/aspnetcore/issues/19926. Add _BlazorResolvedAssembly to FileWrites so it doesn't
-        get removed during build incremantalism. We cannot do this in _ResolveBlazorRuntimeDependencies since it's incremental.
+        Workaround for https://github.com/dotnet/aspnetcore/issues/19926. Add _BlazorResolvedAssembly to FileWrites so that these files
+        do not get removed during an incremental build. Note that we add these files here as opposed to _ResolveBlazorRuntimeDependencies
+        since the task that calculates these items in _ResolveBlazorRuntimeDependencies does not execute in incremental builds.
        -->
       <FileWrites Include="$(_BlazorResolvedAssembly)"/>
     </ItemGroup>
@@ -303,9 +304,9 @@
     </ResolveBlazorRuntimeDependencies>
 
     <!--
-    Workaround for https://github.com/dotnet/aspnetcore/issues/19926. Using the files from their inital locations
+    Workaround for https://github.com/dotnet/aspnetcore/issues/19926. Using the files from their initial locations
     as-is causes RazorSDK to remove files from a hosted app's publish directory. This is because files being removed
-    are looked up by their path. We'll copy files to an intermediate location to trip the removal code.
+    are looked up by their path. We'll copy files to an intermediate location to avoid the removal code.
     -->
     <Copy
       SourceFiles="@(_BlazorResolvedAssemblyUnlinked)"
diff --git a/src/Components/WebAssembly/Build/testassets/blazorhosted/blazorhosted.csproj b/src/Components/WebAssembly/Build/testassets/blazorhosted/blazorhosted.csproj
index af1d77d184..3b08400ff7 100644
--- a/src/Components/WebAssembly/Build/testassets/blazorhosted/blazorhosted.csproj
+++ b/src/Components/WebAssembly/Build/testassets/blazorhosted/blazorhosted.csproj
@@ -6,7 +6,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\standalone\standalone.csproj" />
-    <ProjectReference Include="..\razorclasslibrary\RazorClassLibrary.csproj" />
   </ItemGroup>
 
 </Project>