From d2a4a9f7e036eb5c91331a036f6980d3ae5383a0 Mon Sep 17 00:00:00 2001
From: Steve Pfister <steve.pfister@microsoft.com>
Date: Wed, 2 Nov 2022 17:32:50 -0400
Subject: [PATCH 1/6] Add arm64 workload

---
 eng/Versions.props                                         | 7 ++++---
 .../Microsoft.NET.Workload.Emscripten.Manifest.pkgproj     | 2 +-
 .../WorkloadManifest.json.in                               | 5 ++++-
 eng/workloads/workloads.csproj                             | 5 +++--
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 1f35471918..6e76258044 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -10,9 +10,6 @@
     <EmscriptenVersion>2.0.23</EmscriptenVersion>
     <WorkloadSdkBandVersion Condition="'$(WorkloadSdkBandVersion)' == ''">6.0.100</WorkloadSdkBandVersion>
   </PropertyGroup>
-  <ItemGroup>
-    <WorkloadSdkBandVersions Include="6.0.100;6.0.300;6.0.400" />
-  </ItemGroup>
   <PropertyGroup>
     <StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">true</StabilizePackageVersion>
     <DotNetFinalVersionKind Condition="'$(StabilizePackageVersion)' == 'true'">release</DotNetFinalVersionKind>
@@ -27,4 +24,8 @@
     <SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion>
     <WixPackageVersion>1.0.0-v3.14.0.5722</WixPackageVersion>
   </PropertyGroup>
+  <ItemGroup>
+    <WorkloadSdkBandVersions Include="6.0.100;6.0.300" SupportsMachineArch="false" />
+    <WorkloadSdkBandVersions Include="6.0.400" SupportsMachineArch="true" />
+  </ItemGroup>
 </Project>
diff --git a/eng/nuget/Microsoft.NET.Workload.Emscripten.Manifest/Microsoft.NET.Workload.Emscripten.Manifest.pkgproj b/eng/nuget/Microsoft.NET.Workload.Emscripten.Manifest/Microsoft.NET.Workload.Emscripten.Manifest.pkgproj
index 5a8369a91d..f306cd88d4 100644
--- a/eng/nuget/Microsoft.NET.Workload.Emscripten.Manifest/Microsoft.NET.Workload.Emscripten.Manifest.pkgproj
+++ b/eng/nuget/Microsoft.NET.Workload.Emscripten.Manifest/Microsoft.NET.Workload.Emscripten.Manifest.pkgproj
@@ -13,7 +13,7 @@
   <Target Name="_PrepareForPack" BeforeTargets="GetPackageFiles" Returns="@(PackageFile)">
     <!-- Override the id to include the sdk band as per the workload installer spec -->
     <PropertyGroup>
-      <Id>Microsoft.NET.Workload.Emscripten.Manifest-$(WorkloadSdkBandVersion)</Id>
+      <Id>Microsoft.NET.Workload.Emscripten.Manifest-%(WorkloadSdkBandVersions.Identity)</Id>
     </PropertyGroup>
 
     <PropertyGroup>
diff --git a/eng/nuget/Microsoft.NET.Workload.Emscripten.Manifest/WorkloadManifest.json.in b/eng/nuget/Microsoft.NET.Workload.Emscripten.Manifest/WorkloadManifest.json.in
index d363add35f..659f8545b7 100644
--- a/eng/nuget/Microsoft.NET.Workload.Emscripten.Manifest/WorkloadManifest.json.in
+++ b/eng/nuget/Microsoft.NET.Workload.Emscripten.Manifest/WorkloadManifest.json.in
@@ -9,7 +9,7 @@
         "Microsoft.NET.Runtime.Emscripten.Python.net6",
         "Microsoft.NET.Runtime.Emscripten.Sdk.net6"
       ],
-      "platforms": [ "win-x64", "linux-x64", "osx-x64", "osx-arm64" ]
+      "platforms": [ "win-x64", "win-arm64", "linux-x64", "osx-x64", "osx-arm64" ]
     }
   },
   "packs": {
@@ -18,6 +18,7 @@
       "version": "${PackageVersion}",
       "alias-to": {
         "win-x64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Node.win-x64",
+        "win-arm64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Node.win-x64",
         "linux-x64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Node.linux-x64",
         "osx-x64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Node.osx-x64",
         "osx-arm64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Node.osx-x64"
@@ -28,6 +29,7 @@
       "version": "${PackageVersion}",
       "alias-to": {
         "win-x64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Python.win-x64",
+        "win-arm64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Python.win-x64",
         "osx-x64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Python.osx-x64",
         "osx-arm64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Python.osx-x64"
       }
@@ -37,6 +39,7 @@
       "version": "${PackageVersion}",
       "alias-to": {
         "win-x64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Sdk.win-x64",
+        "win-arm64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Sdk.win-x64",
         "linux-x64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Sdk.linux-x64",
         "osx-x64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Sdk.osx-x64",
         "osx-arm64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Sdk.osx-x64"
diff --git a/eng/workloads/workloads.csproj b/eng/workloads/workloads.csproj
index 75fe5a7d4b..f75e02ee19 100644
--- a/eng/workloads/workloads.csproj
+++ b/eng/workloads/workloads.csproj
@@ -72,9 +72,10 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ManifestPackages Include="$(PackageSource)Microsoft.NET.Workload.Emscripten.Manifest*.nupkg"
+      <ManifestPackages Include="$(PackageSource)Microsoft.NET.Workload.Emscripten.Manifest-%(WorkloadSdkBandVersions.Identity).nupkg"
                         Exclude="$(PackageSource)Microsoft.NET.Workload.Emscripten.Manifest*.msi*.nupkg"
-                        MsiVersion="$(MsiVersion)"/>
+                        MsiVersion="$(MsiVersion)"
+                        SupportsMachineArch="%(SupportsMachineArch)" />
     </ItemGroup>
 
     <CreateVisualStudioWorkload BaseIntermediateOutputPath="$(WorkloadIntermediateOutputPath)"

From 656bfd024735083421811bea1f96d7630b99d8ea Mon Sep 17 00:00:00 2001
From: Steve Pfister <steve.pfister@microsoft.com>
Date: Wed, 2 Nov 2022 18:25:44 -0400
Subject: [PATCH 2/6] Revert nuget id change

---
 eng/Versions.props                                              | 1 -
 .../Microsoft.NET.Workload.Emscripten.Manifest.pkgproj          | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 6e76258044..91dccff276 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -8,7 +8,6 @@
     <PreReleaseVersionIteration>
     </PreReleaseVersionIteration>
     <EmscriptenVersion>2.0.23</EmscriptenVersion>
-    <WorkloadSdkBandVersion Condition="'$(WorkloadSdkBandVersion)' == ''">6.0.100</WorkloadSdkBandVersion>
   </PropertyGroup>
   <PropertyGroup>
     <StabilizePackageVersion Condition="'$(StabilizePackageVersion)' == ''">true</StabilizePackageVersion>
diff --git a/eng/nuget/Microsoft.NET.Workload.Emscripten.Manifest/Microsoft.NET.Workload.Emscripten.Manifest.pkgproj b/eng/nuget/Microsoft.NET.Workload.Emscripten.Manifest/Microsoft.NET.Workload.Emscripten.Manifest.pkgproj
index f306cd88d4..5a8369a91d 100644
--- a/eng/nuget/Microsoft.NET.Workload.Emscripten.Manifest/Microsoft.NET.Workload.Emscripten.Manifest.pkgproj
+++ b/eng/nuget/Microsoft.NET.Workload.Emscripten.Manifest/Microsoft.NET.Workload.Emscripten.Manifest.pkgproj
@@ -13,7 +13,7 @@
   <Target Name="_PrepareForPack" BeforeTargets="GetPackageFiles" Returns="@(PackageFile)">
     <!-- Override the id to include the sdk band as per the workload installer spec -->
     <PropertyGroup>
-      <Id>Microsoft.NET.Workload.Emscripten.Manifest-%(WorkloadSdkBandVersions.Identity)</Id>
+      <Id>Microsoft.NET.Workload.Emscripten.Manifest-$(WorkloadSdkBandVersion)</Id>
     </PropertyGroup>
 
     <PropertyGroup>

From 955d891d416763b8366fd88c25249a97efc925ab Mon Sep 17 00:00:00 2001
From: Steve Pfister <steve.pfister@microsoft.com>
Date: Wed, 2 Nov 2022 18:46:56 -0400
Subject: [PATCH 3/6] Add missing wildcard

---
 eng/workloads/workloads.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/workloads/workloads.csproj b/eng/workloads/workloads.csproj
index f75e02ee19..dc67faba37 100644
--- a/eng/workloads/workloads.csproj
+++ b/eng/workloads/workloads.csproj
@@ -72,7 +72,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ManifestPackages Include="$(PackageSource)Microsoft.NET.Workload.Emscripten.Manifest-%(WorkloadSdkBandVersions.Identity).nupkg"
+      <ManifestPackages Include="$(PackageSource)Microsoft.NET.Workload.Emscripten.Manifest-%(WorkloadSdkBandVersions.Identity).*.nupkg"
                         Exclude="$(PackageSource)Microsoft.NET.Workload.Emscripten.Manifest*.msi*.nupkg"
                         MsiVersion="$(MsiVersion)"
                         SupportsMachineArch="%(SupportsMachineArch)" />

From cf2179fb9d71917aea368d71b86761a548e94bdd Mon Sep 17 00:00:00 2001
From: Steve Pfister <steve.pfister@microsoft.com>
Date: Thu, 3 Nov 2022 11:28:32 -0400
Subject: [PATCH 4/6] Use mauiarm version

---
 eng/Versions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 91dccff276..72d3523799 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <MajorVersion>6</MajorVersion>
     <MinorVersion>0</MinorVersion>
-    <VersionPrefix>6.0.11</VersionPrefix>
+    <VersionPrefix>6.0.11-mauiarm</VersionPrefix>
     <PreReleaseVersionLabel>rtm</PreReleaseVersionLabel>
     <PreReleaseVersionIteration>
     </PreReleaseVersionIteration>

From bfa829ab36a15fa89334e7471b2fdd97395e32e3 Mon Sep 17 00:00:00 2001
From: Steve Pfister <steve.pfister@microsoft.com>
Date: Mon, 7 Nov 2022 14:21:34 -0500
Subject: [PATCH 5/6] Remove mauiarm version

---
 eng/Versions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 72d3523799..91dccff276 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <MajorVersion>6</MajorVersion>
     <MinorVersion>0</MinorVersion>
-    <VersionPrefix>6.0.11-mauiarm</VersionPrefix>
+    <VersionPrefix>6.0.11</VersionPrefix>
     <PreReleaseVersionLabel>rtm</PreReleaseVersionLabel>
     <PreReleaseVersionIteration>
     </PreReleaseVersionIteration>

From 946c60ce4397f026771a96f2fb81a36e247abfd8 Mon Sep 17 00:00:00 2001
From: Steve Pfister <steve.pfister@microsoft.com>
Date: Tue, 8 Nov 2022 12:34:28 -0500
Subject: [PATCH 6/6] Bump version to 6.0.12

---
 eng/Versions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index 91dccff276..eb56600bca 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <MajorVersion>6</MajorVersion>
     <MinorVersion>0</MinorVersion>
-    <VersionPrefix>6.0.11</VersionPrefix>
+    <VersionPrefix>6.0.12</VersionPrefix>
     <PreReleaseVersionLabel>rtm</PreReleaseVersionLabel>
     <PreReleaseVersionIteration>
     </PreReleaseVersionIteration>