From 3fe6b07412984035dd69ea6757156dd7c8bd1c93 Mon Sep 17 00:00:00 2001
From: Pranav K <prkrishn@hotmail.com>
Date: Tue, 30 Jun 2020 11:38:20 -0700
Subject: [PATCH] Ensure BlazorWebAssembly.js is present (#23518)

---
 .../Microsoft.AspNetCore.Components.WebAssembly.props    | 5 +++++
 .../Microsoft.NET.Sdk.Razor.Components.Wasm.targets      | 9 ++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 src/Components/WebAssembly/WebAssembly/src/build/net5.0/Microsoft.AspNetCore.Components.WebAssembly.props

diff --git a/src/Components/WebAssembly/WebAssembly/src/build/net5.0/Microsoft.AspNetCore.Components.WebAssembly.props b/src/Components/WebAssembly/WebAssembly/src/build/net5.0/Microsoft.AspNetCore.Components.WebAssembly.props
new file mode 100644
index 0000000000..41ae67bf35
--- /dev/null
+++ b/src/Components/WebAssembly/WebAssembly/src/build/net5.0/Microsoft.AspNetCore.Components.WebAssembly.props
@@ -0,0 +1,5 @@
+<Project>
+  <PropertyGroup>
+    <BlazorWebAssemblyJSPath>$(MSBuildThisFileDirectory)blazor.webassembly.js</BlazorWebAssemblyJSPath>
+  </PropertyGroup>
+</Project>
diff --git a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Components.Wasm.targets b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Components.Wasm.targets
index fff9969bcb..1d293e3ef4 100644
--- a/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Components.Wasm.targets
+++ b/src/Razor/Microsoft.NET.Sdk.Razor/src/build/netstandard2.0/Microsoft.NET.Sdk.Razor.Components.Wasm.targets
@@ -92,6 +92,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     <!--
       Calculates the outputs and the paths for Blazor WASM. This target is invoked frequently and should perform minimal work.
     -->
+
     <ItemGroup>
       <_BlazorJSFile Include="$(BlazorWebAssemblyJSPath)" />
       <_BlazorJSFile Include="$(BlazorWebAssemblyJSMapPath)" Condition="Exists('$(BlazorWebAssemblyJSMapPath)')" />
@@ -140,7 +141,7 @@ Copyright (c) .NET Foundation. All rights reserved.
       <Output TaskParameter="SatelliteAssembly" ItemName="_BlazorReadSatelliteAssembly" />
     </BlazorReadSatelliteAssemblyFile>
 
-    <ItemGroup >
+    <ItemGroup>
       <!-- We've imported a previously Cacheed file. Let's turn in to a _BlazorOutputWithTargetPath -->
       <_BlazorOutputWithTargetPath
         Include="@(_BlazorReadSatelliteAssembly)"
@@ -162,6 +163,12 @@ Copyright (c) .NET Foundation. All rights reserved.
       <ReferenceCopyLocalPaths DestinationSubDirectory="$(_BlazorOutputPath)%(ReferenceCopyLocalPaths.DestinationSubDirectory)" />
     </ItemGroup>
 
+    <!-- A missing blazor.webassembly.js is our packaging error. Produce an error so it's discovered early. -->
+    <Error
+      Text="Unable to find BlazorWebAssembly JS files. This usually indicates a packaging error."
+      Code="RAZORSDK1007"
+      Condition="'@(_BlazorJSFile->Count())' == '0'" />
+
     <!--
       When building with BuildingProject=false, satellite assemblies do not get resolved (the ones for the current project and the one for
       referenced project). BuildingProject=false is typically set for referenced projects when building inside VisualStudio.