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] 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
 {