diff --git a/eng/Versions.props b/eng/Versions.props
index 0e99e49d53..ac6beb1a6e 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -6,7 +6,6 @@
8.0.0
alpha
1
- 8.0.100
3.1.12
2.0.23
6.0.9
@@ -25,4 +24,7 @@
1.1.87-gba258badda
1.0.0-v3.14.0.5722
+
+
+
diff --git a/eng/nuget/Microsoft.NET.Workload.Emscripten.net6.Manifest/Microsoft.NET.Workload.Emscripten.net6.Manifest.pkgproj b/eng/nuget/Microsoft.NET.Workload.Emscripten.net6.Manifest/Microsoft.NET.Workload.Emscripten.net6.Manifest.pkgproj
index c063fe2050..f6fb24d57c 100644
--- a/eng/nuget/Microsoft.NET.Workload.Emscripten.net6.Manifest/Microsoft.NET.Workload.Emscripten.net6.Manifest.pkgproj
+++ b/eng/nuget/Microsoft.NET.Workload.Emscripten.net6.Manifest/Microsoft.NET.Workload.Emscripten.net6.Manifest.pkgproj
@@ -13,7 +13,7 @@
- Microsoft.NET.Workload.Emscripten.net6.Manifest-$(WorkloadSdkBandVersion)
+ Microsoft.NET.Workload.Emscripten.net6.Manifest-%(WorkloadSdkBandVersions.Identity)
diff --git a/eng/nuget/Microsoft.NET.Workload.Emscripten.net6.Manifest/WorkloadManifest.json.in b/eng/nuget/Microsoft.NET.Workload.Emscripten.net6.Manifest/WorkloadManifest.json.in
index cd7e3938ec..d888e3fe06 100644
--- a/eng/nuget/Microsoft.NET.Workload.Emscripten.net6.Manifest/WorkloadManifest.json.in
+++ b/eng/nuget/Microsoft.NET.Workload.Emscripten.net6.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": "${PackageVersionNet6}",
"alias-to": {
"win-x64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersionNet6}.Node.win-x64",
+ "win-arm64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersionNet6}.Node.win-x64",
"linux-x64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersionNet6}.Node.linux-x64",
"osx-x64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersionNet6}.Node.osx-x64",
"osx-arm64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersionNet6}.Node.osx-x64"
@@ -28,6 +29,7 @@
"version": "${PackageVersionNet6}",
"alias-to": {
"win-x64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersionNet6}.Python.win-x64",
+ "win-arm64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersionNet6}.Python.win-x64",
"osx-x64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersionNet6}.Python.osx-x64",
"osx-arm64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersionNet6}.Python.osx-x64"
}
@@ -37,6 +39,7 @@
"version": "${PackageVersionNet6}",
"alias-to": {
"win-x64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersionNet6}.Sdk.win-x64",
+ "win-arm64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersionNet6}.Sdk.win-x64",
"linux-x64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersionNet6}.Sdk.linux-x64",
"osx-x64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersionNet6}.Sdk.osx-x64",
"osx-arm64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersionNet6}.Sdk.osx-x64"
diff --git a/eng/nuget/Microsoft.NET.Workload.Emscripten.net7.Manifest/Microsoft.NET.Workload.Emscripten.net7.Manifest.pkgproj b/eng/nuget/Microsoft.NET.Workload.Emscripten.net7.Manifest/Microsoft.NET.Workload.Emscripten.net7.Manifest.pkgproj
index 05a67f078d..a7db79535f 100644
--- a/eng/nuget/Microsoft.NET.Workload.Emscripten.net7.Manifest/Microsoft.NET.Workload.Emscripten.net7.Manifest.pkgproj
+++ b/eng/nuget/Microsoft.NET.Workload.Emscripten.net7.Manifest/Microsoft.NET.Workload.Emscripten.net7.Manifest.pkgproj
@@ -13,7 +13,7 @@
- Microsoft.NET.Workload.Emscripten.net7.Manifest-$(WorkloadSdkBandVersion)
+ Microsoft.NET.Workload.Emscripten.net7.Manifest-%(WorkloadSdkBandVersions.Identity)
diff --git a/eng/nuget/Microsoft.NET.Workload.Emscripten.net7.Manifest/WorkloadManifest.json.in b/eng/nuget/Microsoft.NET.Workload.Emscripten.net7.Manifest/WorkloadManifest.json.in
index d19720689d..391f5fdbe8 100644
--- a/eng/nuget/Microsoft.NET.Workload.Emscripten.net7.Manifest/WorkloadManifest.json.in
+++ b/eng/nuget/Microsoft.NET.Workload.Emscripten.net7.Manifest/WorkloadManifest.json.in
@@ -10,7 +10,7 @@
"Microsoft.NET.Runtime.Emscripten.Cache.net7",
"Microsoft.NET.Runtime.Emscripten.Sdk.net7"
],
- "platforms": [ "win-x64", "linux-x64", "osx-x64", "osx-arm64" ]
+ "platforms": [ "win-x64", "win-arm64", "linux-x64", "osx-x64", "osx-arm64" ]
}
},
"packs": {
@@ -19,6 +19,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"
@@ -29,6 +30,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"
}
@@ -38,6 +40,7 @@
"version": "${PackageVersion}",
"alias-to": {
"win-x64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Cache.win-x64",
+ "win-arm64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Cache.win-x64",
"linux-x64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Cache.linux-x64",
"osx-x64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Cache.osx-x64",
"osx-arm64": "Microsoft.NET.Runtime.Emscripten.${EmscriptenVersion}.Cache.osx-x64"
@@ -48,6 +51,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 51de500148..9cbb80bd0a 100644
--- a/eng/workloads/workloads.csproj
+++ b/eng/workloads/workloads.csproj
@@ -74,9 +74,10 @@
-
+ MsiVersion="$(MsiVersion)"
+ SupportsMachineArch="%(SupportsMachineArch)" />