From 0b415b91bd45ae542028195a02b4ca106e379468 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Tue, 21 Jul 2020 16:01:29 -0700
Subject: [PATCH] Fix Blazor WASM SDK bugs (#24172)

* Correctly calculate tasks path when running as a SDK
* Do not perform service-worker things when project does not require it
---
 .../WasmBuildIntegrationTest.cs               | 23 ++++++++++++++
 .../WasmPublishIntegrationTest.cs             | 29 +++++++++++++++++
 ....NET.Sdk.BlazorWebAssembly.Current.targets |  4 +--
 .../RestoreBlazorWasmTestProjects.csproj      |  1 +
 .../testassets/blazorwasm-minimal/App.razor   |  8 +++++
 .../blazorwasm-minimal/Pages/Index.razor      |  5 +++
 .../testassets/blazorwasm-minimal/Program.cs  | 11 +++++++
 .../blazorwasm-minimal/_Imports.razor         |  2 ++
 .../blazorwasm-minimal.csproj                 | 31 +++++++++++++++++++
 .../blazorwasm-minimal/wwwroot/css/app.css    |  1 +
 .../blazorwasm-minimal/wwwroot/index.html     | 24 ++++++++++++++
 11 files changed, 137 insertions(+), 2 deletions(-)
 create mode 100644 src/Components/WebAssembly/Sdk/testassets/blazorwasm-minimal/App.razor
 create mode 100644 src/Components/WebAssembly/Sdk/testassets/blazorwasm-minimal/Pages/Index.razor
 create mode 100644 src/Components/WebAssembly/Sdk/testassets/blazorwasm-minimal/Program.cs
 create mode 100644 src/Components/WebAssembly/Sdk/testassets/blazorwasm-minimal/_Imports.razor
 create mode 100644 src/Components/WebAssembly/Sdk/testassets/blazorwasm-minimal/blazorwasm-minimal.csproj
 create mode 100644 src/Components/WebAssembly/Sdk/testassets/blazorwasm-minimal/wwwroot/css/app.css
 create mode 100644 src/Components/WebAssembly/Sdk/testassets/blazorwasm-minimal/wwwroot/index.html

diff --git a/src/Components/WebAssembly/Sdk/integrationtests/WasmBuildIntegrationTest.cs b/src/Components/WebAssembly/Sdk/integrationtests/WasmBuildIntegrationTest.cs
index c521c6be7e..0f109465ad 100644
--- a/src/Components/WebAssembly/Sdk/integrationtests/WasmBuildIntegrationTest.cs
+++ b/src/Components/WebAssembly/Sdk/integrationtests/WasmBuildIntegrationTest.cs
@@ -14,6 +14,29 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
     {
         private static readonly string DotNetJsFileName = $"dotnet.{BuildVariables.MicrosoftNETCoreAppRuntimeVersion}.js";
 
+        [Fact]
+        public async Task BuildMinimal_Works()
+        {
+            // Arrange
+            // Minimal has no project references, service worker etc. This is pretty close to the project template.
+            using var project = ProjectDirectory.Create("blazorwasm-minimal");
+            var result = await MSBuildProcessManager.DotnetMSBuild(project);
+
+            Assert.BuildPassed(result);
+
+            var buildOutputDirectory = project.BuildOutputDirectory;
+
+            Assert.FileExists(result, buildOutputDirectory, "wwwroot", "_framework", "blazor.boot.json");
+            Assert.FileExists(result, buildOutputDirectory, "wwwroot", "_framework", "blazor.webassembly.js");
+            Assert.FileExists(result, buildOutputDirectory, "wwwroot", "_framework", "dotnet.wasm");
+            Assert.FileExists(result, buildOutputDirectory, "wwwroot", "_framework", "dotnet.wasm.gz");
+            Assert.FileExists(result, buildOutputDirectory, "wwwroot", "_framework", DotNetJsFileName);
+            Assert.FileExists(result, buildOutputDirectory, "wwwroot", "_framework", "blazorwasm-minimal.dll");
+
+            var staticWebAssets = Assert.FileExists(result, buildOutputDirectory, "blazorwasm-minimal.StaticWebAssets.xml");
+            Assert.FileContains(result, staticWebAssets, Path.Combine(project.TargetFramework, "wwwroot"));
+        }
+
         [Fact]
         public async Task Build_Works()
         {
diff --git a/src/Components/WebAssembly/Sdk/integrationtests/WasmPublishIntegrationTest.cs b/src/Components/WebAssembly/Sdk/integrationtests/WasmPublishIntegrationTest.cs
index 1108d0bff9..590153a114 100644
--- a/src/Components/WebAssembly/Sdk/integrationtests/WasmPublishIntegrationTest.cs
+++ b/src/Components/WebAssembly/Sdk/integrationtests/WasmPublishIntegrationTest.cs
@@ -17,6 +17,35 @@ namespace Microsoft.AspNetCore.Razor.Design.IntegrationTests
     {
         private static readonly string DotNetJsFileName = $"dotnet.{BuildVariables.MicrosoftNETCoreAppRuntimeVersion}.js";
 
+        [Fact]
+        public async Task Publish_MinimalApp_Works()
+        {
+            // Arrange
+            using var project = ProjectDirectory.Create("blazorwasm-minimal");
+            var result = await MSBuildProcessManager.DotnetMSBuild(project, "Publish");
+
+            Assert.BuildPassed(result);
+
+            var publishDirectory = project.PublishOutputDirectory;
+
+            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", "dotnet.wasm");
+            Assert.FileExists(result, blazorPublishDirectory, "_framework", DotNetJsFileName);
+            Assert.FileExists(result, blazorPublishDirectory, "_framework", "blazorwasm-minimal.dll");
+
+            // Verify static assets are in the publish directory
+            Assert.FileExists(result, blazorPublishDirectory, "index.html");
+
+            // Verify web.config
+            Assert.FileExists(result, publishDirectory, "web.config");
+            Assert.FileCountEquals(result, 1, publishDirectory, "*", SearchOption.TopDirectoryOnly);
+
+            VerifyBootManifestHashes(result, blazorPublishDirectory);
+        }
+
         [Fact]
         public async Task Publish_WithDefaultSettings_Works()
         {
diff --git a/src/Components/WebAssembly/Sdk/src/targets/Microsoft.NET.Sdk.BlazorWebAssembly.Current.targets b/src/Components/WebAssembly/Sdk/src/targets/Microsoft.NET.Sdk.BlazorWebAssembly.Current.targets
index a11bc00625..f0b8941d12 100644
--- a/src/Components/WebAssembly/Sdk/src/targets/Microsoft.NET.Sdk.BlazorWebAssembly.Current.targets
+++ b/src/Components/WebAssembly/Sdk/src/targets/Microsoft.NET.Sdk.BlazorWebAssembly.Current.targets
@@ -32,7 +32,7 @@ Copyright (c) .NET Foundation. All rights reserved.
 
   <PropertyGroup>
     <!-- Paths to tools, tasks, and extensions are calculated relative to the BlazorWebAssemblySdkDirectoryRoot. This can be modified to test a local build. -->
-    <BlazorWebAssemblySdkDirectoryRoot Condition="'$(BlazorWebAssemblySdkDirectoryRoot)'==''">$(MSBuildThisFileDirectory)..\..\</BlazorWebAssemblySdkDirectoryRoot>
+    <BlazorWebAssemblySdkDirectoryRoot Condition="'$(BlazorWebAssemblySdkDirectoryRoot)'==''">$(MSBuildThisFileDirectory)..\</BlazorWebAssemblySdkDirectoryRoot>
     <_BlazorWebAssemblySdkTasksTFM Condition=" '$(MSBuildRuntimeType)' == 'Core'">net5.0</_BlazorWebAssemblySdkTasksTFM>
     <_BlazorWebAssemblySdkTasksTFM Condition=" '$(MSBuildRuntimeType)' != 'Core'">net46</_BlazorWebAssemblySdkTasksTFM>
     <_BlazorWebAssemblySdkTasksAssembly>$(BlazorWebAssemblySdkDirectoryRoot)tasks\$(_BlazorWebAssemblySdkTasksTFM)\Microsoft.NET.Sdk.BlazorWebAssembly.Tasks.dll</_BlazorWebAssemblySdkTasksAssembly>
@@ -69,7 +69,7 @@ Copyright (c) .NET Foundation. All rights reserved.
 
   </PropertyGroup>
 
-  <Import Project="Microsoft.NET.Sdk.BlazorWebAssembly.ServiceWorkerAssetsManifest.targets" />
+  <Import Project="Microsoft.NET.Sdk.BlazorWebAssembly.ServiceWorkerAssetsManifest.targets" Condition="'$(ServiceWorkerAssetsManifest)' != ''" />
 
   <Target Name="_ScrambleDotnetJsFileName" AfterTargets="ResolveRuntimePackAssets">
     <!--
diff --git a/src/Components/WebAssembly/Sdk/testassets/RestoreBlazorWasmTestProjects/RestoreBlazorWasmTestProjects.csproj b/src/Components/WebAssembly/Sdk/testassets/RestoreBlazorWasmTestProjects/RestoreBlazorWasmTestProjects.csproj
index f4debf8088..46b847139d 100644
--- a/src/Components/WebAssembly/Sdk/testassets/RestoreBlazorWasmTestProjects/RestoreBlazorWasmTestProjects.csproj
+++ b/src/Components/WebAssembly/Sdk/testassets/RestoreBlazorWasmTestProjects/RestoreBlazorWasmTestProjects.csproj
@@ -7,6 +7,7 @@
     <ProjectReference Include="..\blazorhosted\blazorhosted.csproj" />
     <ProjectReference Include="..\blazorhosted-rid\blazorhosted-rid.csproj" />
     <ProjectReference Include="..\blazorwasm\blazorwasm.csproj" />
+    <ProjectReference Include="..\blazorwasm-minimal\blazorwasm-minimal.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Components/WebAssembly/Sdk/testassets/blazorwasm-minimal/App.razor b/src/Components/WebAssembly/Sdk/testassets/blazorwasm-minimal/App.razor
new file mode 100644
index 0000000000..eba23da9b5
--- /dev/null
+++ b/src/Components/WebAssembly/Sdk/testassets/blazorwasm-minimal/App.razor
@@ -0,0 +1,8 @@
+<Router AppAssembly="@typeof(Program).Assembly">
+    <Found Context="routeData">
+        <RouteView RouteData="@routeData"/>
+    </Found>
+    <NotFound>
+        <p>Sorry, there's nothing at this address.</p>
+    </NotFound>
+</Router>
diff --git a/src/Components/WebAssembly/Sdk/testassets/blazorwasm-minimal/Pages/Index.razor b/src/Components/WebAssembly/Sdk/testassets/blazorwasm-minimal/Pages/Index.razor
new file mode 100644
index 0000000000..16dac31925
--- /dev/null
+++ b/src/Components/WebAssembly/Sdk/testassets/blazorwasm-minimal/Pages/Index.razor
@@ -0,0 +1,5 @@
+@page "/"
+
+<h1>Hello, world!</h1>
+
+Welcome to your new app.
diff --git a/src/Components/WebAssembly/Sdk/testassets/blazorwasm-minimal/Program.cs b/src/Components/WebAssembly/Sdk/testassets/blazorwasm-minimal/Program.cs
new file mode 100644
index 0000000000..3ebadb8b76
--- /dev/null
+++ b/src/Components/WebAssembly/Sdk/testassets/blazorwasm-minimal/Program.cs
@@ -0,0 +1,11 @@
+using System;
+
+namespace standalone
+{
+    public class Program
+    {
+        public static void Main(string[] args)
+        {
+        }
+    }
+}
diff --git a/src/Components/WebAssembly/Sdk/testassets/blazorwasm-minimal/_Imports.razor b/src/Components/WebAssembly/Sdk/testassets/blazorwasm-minimal/_Imports.razor
new file mode 100644
index 0000000000..129b440e86
--- /dev/null
+++ b/src/Components/WebAssembly/Sdk/testassets/blazorwasm-minimal/_Imports.razor
@@ -0,0 +1,2 @@
+@using Microsoft.AspNetCore.Components.Routing
+@using standalone
diff --git a/src/Components/WebAssembly/Sdk/testassets/blazorwasm-minimal/blazorwasm-minimal.csproj b/src/Components/WebAssembly/Sdk/testassets/blazorwasm-minimal/blazorwasm-minimal.csproj
new file mode 100644
index 0000000000..bfebc5b020
--- /dev/null
+++ b/src/Components/WebAssembly/Sdk/testassets/blazorwasm-minimal/blazorwasm-minimal.csproj
@@ -0,0 +1,31 @@
+<Project Sdk="Microsoft.NET.Sdk.Razor">
+
+  <Import Project="$(RepoRoot)src\Components\WebAssembly\Sdk\src\Sdk\Sdk.props" />
+
+  <PropertyGroup>
+    <TargetFramework>net5.0</TargetFramework>
+    <RuntimeIdentifier>browser-wasm</RuntimeIdentifier>
+    <RazorSdkDirectoryRoot>$(RazorSdkArtifactsDirectory)$(Configuration)\sdk-output\</RazorSdkDirectoryRoot>
+    <BlazorWebAssemblySdkDirectoryRoot>$(BlazorWebAssemblySdkArtifactsDirectory)$(Configuration)\sdk-output\</BlazorWebAssemblySdkDirectoryRoot>
+  </PropertyGroup>
+
+  <!-- Test Placeholder -->
+
+  <PropertyGroup Condition="'$(RunningAsTest)' == ''">
+    <!-- We don't want to run build server when not running as tests. -->
+    <UseRazorBuildServer>false</UseRazorBuildServer>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(BinariesRoot)'==''">
+    <!-- In test scenarios $(BinariesRoot) is defined in a generated Directory.Build.props file -->
+    <BinariesRoot>$(RepoRoot)artifacts\bin\Microsoft.AspNetCore.Razor.Test.MvcShim.ClassLib\$(Configuration)\netstandard2.0\</BinariesRoot>
+  </PropertyGroup>
+
+  <!-- DO NOT add addition references here. This is meant to simulate a non-MVC library -->
+  <ItemGroup Condition="'$(BinariesRoot)'!=''">
+    <Reference Include="$(BinariesRoot)\Microsoft.AspNetCore.Razor.Test.ComponentShim.dll"/>
+  </ItemGroup>
+
+  <Import Project="$(RepoRoot)src\Components\WebAssembly\Sdk\src\Sdk\Sdk.targets" />
+
+</Project>
diff --git a/src/Components/WebAssembly/Sdk/testassets/blazorwasm-minimal/wwwroot/css/app.css b/src/Components/WebAssembly/Sdk/testassets/blazorwasm-minimal/wwwroot/css/app.css
new file mode 100644
index 0000000000..fc64a12376
--- /dev/null
+++ b/src/Components/WebAssembly/Sdk/testassets/blazorwasm-minimal/wwwroot/css/app.css
@@ -0,0 +1 @@
+.build { }
diff --git a/src/Components/WebAssembly/Sdk/testassets/blazorwasm-minimal/wwwroot/index.html b/src/Components/WebAssembly/Sdk/testassets/blazorwasm-minimal/wwwroot/index.html
new file mode 100644
index 0000000000..bbfa66c41a
--- /dev/null
+++ b/src/Components/WebAssembly/Sdk/testassets/blazorwasm-minimal/wwwroot/index.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width" />
+    <title>standalone</title>
+    <base href="/" />
+    <link href="css/bootstrap/bootstrap.min.css" rel="stylesheet" />
+    <link href="css/app.css" rel="stylesheet" />
+</head>
+
+<body>
+    <app>Loading...</app>
+
+    <div id="blazor-error-ui">
+        An unhandled error has occurred.
+        <a href="" class="reload">Reload</a>
+        <a class="dismiss">🗙</a>
+    </div>
+    <script src="_framework/blazor.webassembly.js"></script>
+</body>
+
+</html>