From 4b6eb586264ed7dd40b62f6f7aed560d729964fc Mon Sep 17 00:00:00 2001
From: Larry Ewing <lewing@microsoft.com>
Date: Fri, 26 Mar 2021 20:29:55 -0500
Subject: [PATCH 1/4] update the workload manifest

---
 .../WebAssembly/BlazorManifest/src/WorkloadManifest.json.in    | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/Components/WebAssembly/BlazorManifest/src/WorkloadManifest.json.in b/src/Components/WebAssembly/BlazorManifest/src/WorkloadManifest.json.in
index 937de24478be..57d5f1500cfb 100644
--- a/src/Components/WebAssembly/BlazorManifest/src/WorkloadManifest.json.in
+++ b/src/Components/WebAssembly/BlazorManifest/src/WorkloadManifest.json.in
@@ -26,7 +26,6 @@
       "kind": "Sdk",
       "version": "${MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion}",
       "alias-to": {
-        "win-x86": "microsoft.netcore.app.runtime.aot.win-x86.cross.browser-wasm",
         "win-x64": "microsoft.netcore.app.runtime.aot.win-x64.cross.browser-wasm",
         "linux-x64": "microsoft.netcore.app.runtime.aot.linux-x64.cross.browser-wasm",
         "osx-x64": "microsoft.netcore.app.runtime.aot.osx-x64.cross.browser-wasm"
@@ -46,7 +45,6 @@
       "kind": "Sdk",
       "version": "${MicrosoftNETRuntimeEmscripten2012Pythonwinx64Version}",
       "alias-to": {
-        "win-x86": "Microsoft.NET.Runtime.Emscripten.2.0.12.Python.win-x86",
         "win-x64": "Microsoft.NET.Runtime.Emscripten.2.0.12.Python.win-x64",
         "osx-x64": "Microsoft.NET.Runtime.Emscripten.2.0.12.Python.osx-x64"
       }
@@ -55,7 +53,6 @@
       "kind": "Sdk",
       "version": "${MicrosoftNETRuntimeEmscripten2012Sdkwinx64Version}",
       "alias-to": {
-        "win-x86": "Microsoft.NET.Runtime.Emscripten.2.0.12.Sdk.win-x86",
         "win-x64": "Microsoft.NET.Runtime.Emscripten.2.0.12.Sdk.win-x64",
         "linux-x64": "Microsoft.NET.Runtime.Emscripten.2.0.12.Sdk.linux-x64",
         "osx-x64": "Microsoft.NET.Runtime.Emscripten.2.0.12.Sdk.osx-x64"

From ea36184ea6ca706c59db6b22d68a674763a595f5 Mon Sep 17 00:00:00 2001
From: Larry Ewing <lewing@microsoft.com>
Date: Fri, 26 Mar 2021 20:37:11 -0500
Subject: [PATCH 2/4] update the targets for the new condition

---
 .../BlazorManifest/src/WorkloadManifest.targets     | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/Components/WebAssembly/BlazorManifest/src/WorkloadManifest.targets b/src/Components/WebAssembly/BlazorManifest/src/WorkloadManifest.targets
index 307be3921bef..9c4d935be0d6 100644
--- a/src/Components/WebAssembly/BlazorManifest/src/WorkloadManifest.targets
+++ b/src/Components/WebAssembly/BlazorManifest/src/WorkloadManifest.targets
@@ -1,13 +1,18 @@
 <Project>
-    <PropertyGroup Condition="'$(UsingMicrosoftNETSdkBlazorWebAssembly)'=='true' AND '$(RunAOTCompilation)' == 'true'">
+    <PropertyGroup Condition="'$(RuntimeIdentifier)' == 'browser-wasm'">
+        <UsingBrowserRuntimeWorkload Condition="'$(RunAOTCompilation)' == 'true' or '$(UsingMicrosoftNETSdkBlazorWebAssembly)'=='false'" >true</UsingBrowserRuntimeWorkload>
+        <UsingBrowserRuntimeWorkload Condition="'$(UsingBrowserRuntimeWorkload)' == ''" >$(WasmNativeWorkload)</UsingBrowserRuntimeWorkload>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(UsingMicrosoftNETSdkBlazorWebAssembly)'=='true' and '$(UsingBrowserRuntimeWorkload)' == 'true'">
+      <WasmGenerateAppBundle>false</WasmGenerateAppBundle>
       <UsingBlazorAOTWorkloadManifest>true</UsingBlazorAOTWorkloadManifest>
     </PropertyGroup>
 
-    <ImportGroup Condition="'$(UsingMicrosoftNETSdkBlazorWebAssembly)'=='true' AND '$(RunAOTCompilation)' == 'true'">
-      <Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.MonoAOTCompiler.Task" />
+    <ImportGroup Condition="'$(UsingBrowserRuntimeWorkload)' == 'true'">
+      <Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Condition="'$(RunAOTCompilation)' == 'true'" />
       <Import Project="Sdk.targets" Sdk="Microsoft.NET.Runtime.WebAssembly.Sdk" />
       <Import Project="Sdk.props" Sdk="Microsoft.Netcore.App.Runtime.Aot.Cross.browser-wasm" />
-      <Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.Emscripten.Python" Condition="!$([MSBuild]::IsOsPlatform('Linux'))" />
+      <Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.Emscripten.Python" Condition="!$([MSBuild]::IsOSPlatform('linux'))" />
       <Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.Emscripten.Node" />
       <Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.Emscripten.Sdk" />
     </ImportGroup>

From 0ea7b43737e9e4eaa5d00996d3bd41af6c8eded2 Mon Sep 17 00:00:00 2001
From: Larry Ewing <lewing@microsoft.com>
Date: Wed, 21 Apr 2021 15:50:31 -0500
Subject: [PATCH 3/4] Small fixes to the manifest

---
 .../BlazorManifest/src/WorkloadManifest.json.in     | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/Components/WebAssembly/BlazorManifest/src/WorkloadManifest.json.in b/src/Components/WebAssembly/BlazorManifest/src/WorkloadManifest.json.in
index 57d5f1500cfb..6625cba0a10b 100644
--- a/src/Components/WebAssembly/BlazorManifest/src/WorkloadManifest.json.in
+++ b/src/Components/WebAssembly/BlazorManifest/src/WorkloadManifest.json.in
@@ -2,7 +2,7 @@
   "version": 1,
   "workloads": {
     "microsoft-net-sdk-blazorwebassembly-aot": {
-      "description": "Blazor WebAssembly AOT workload",
+      "description": "Browser WebAssembly runtime optimization tools",
       "packs": [
         "Microsoft.NET.Runtime.MonoAOTCompiler.Task",
         "Microsoft.NET.Runtime.WebAssembly.Sdk",
@@ -26,9 +26,10 @@
       "kind": "Sdk",
       "version": "${MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion}",
       "alias-to": {
-        "win-x64": "microsoft.netcore.app.runtime.aot.win-x64.cross.browser-wasm",
-        "linux-x64": "microsoft.netcore.app.runtime.aot.linux-x64.cross.browser-wasm",
-        "osx-x64": "microsoft.netcore.app.runtime.aot.osx-x64.cross.browser-wasm"
+        "win-x86": "Microsoft.NETCore.App.Runtime.AOT.win-x86.Cross.browser-wasm",
+        "win-x64": "Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm",
+        "linux-x64": "Microsoft.NETCore.App.Runtime.AOT.linux-x64.Cross.browser-wasm",
+        "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.browser-wasm"
       }
     },
     "Microsoft.NET.Runtime.Emscripten.Node" : {
@@ -45,6 +46,7 @@
       "kind": "Sdk",
       "version": "${MicrosoftNETRuntimeEmscripten2012Pythonwinx64Version}",
       "alias-to": {
+        "win-x86": "Microsoft.NET.Runtime.Emscripten.2.0.12.Python.win-x86",
         "win-x64": "Microsoft.NET.Runtime.Emscripten.2.0.12.Python.win-x64",
         "osx-x64": "Microsoft.NET.Runtime.Emscripten.2.0.12.Python.osx-x64"
       }
@@ -53,10 +55,11 @@
       "kind": "Sdk",
       "version": "${MicrosoftNETRuntimeEmscripten2012Sdkwinx64Version}",
       "alias-to": {
+        "win-x86": "Microsoft.NET.Runtime.Emscripten.2.0.12.Sdk.win-x86",
         "win-x64": "Microsoft.NET.Runtime.Emscripten.2.0.12.Sdk.win-x64",
         "linux-x64": "Microsoft.NET.Runtime.Emscripten.2.0.12.Sdk.linux-x64",
         "osx-x64": "Microsoft.NET.Runtime.Emscripten.2.0.12.Sdk.osx-x64"
       }
     }
   }
-}
+}
\ No newline at end of file

From 64c3065532a7663e32d3bee5577077aea7cc7e9d Mon Sep 17 00:00:00 2001
From: Larry Ewing <lewing@microsoft.com>
Date: Wed, 21 Apr 2021 20:37:03 -0500
Subject: [PATCH 4/4] Fix a condition and some formatting

---
 .../WebAssembly/BlazorManifest/src/WorkloadManifest.targets   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Components/WebAssembly/BlazorManifest/src/WorkloadManifest.targets b/src/Components/WebAssembly/BlazorManifest/src/WorkloadManifest.targets
index 9c4d935be0d6..2dc2cc3ff0bf 100644
--- a/src/Components/WebAssembly/BlazorManifest/src/WorkloadManifest.targets
+++ b/src/Components/WebAssembly/BlazorManifest/src/WorkloadManifest.targets
@@ -1,9 +1,9 @@
 <Project>
     <PropertyGroup Condition="'$(RuntimeIdentifier)' == 'browser-wasm'">
-        <UsingBrowserRuntimeWorkload Condition="'$(RunAOTCompilation)' == 'true' or '$(UsingMicrosoftNETSdkBlazorWebAssembly)'=='false'" >true</UsingBrowserRuntimeWorkload>
+        <UsingBrowserRuntimeWorkload Condition="'$(RunAOTCompilation)' == 'true' or '$(UsingMicrosoftNETSdkBlazorWebAssembly)' != 'true'" >true</UsingBrowserRuntimeWorkload>
         <UsingBrowserRuntimeWorkload Condition="'$(UsingBrowserRuntimeWorkload)' == ''" >$(WasmNativeWorkload)</UsingBrowserRuntimeWorkload>
     </PropertyGroup>
-    <PropertyGroup Condition="'$(UsingMicrosoftNETSdkBlazorWebAssembly)'=='true' and '$(UsingBrowserRuntimeWorkload)' == 'true'">
+    <PropertyGroup Condition="'$(UsingMicrosoftNETSdkBlazorWebAssembly)' == 'true' and '$(UsingBrowserRuntimeWorkload)' == 'true'" >
       <WasmGenerateAppBundle>false</WasmGenerateAppBundle>
       <UsingBlazorAOTWorkloadManifest>true</UsingBlazorAOTWorkloadManifest>
     </PropertyGroup>