diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 00d781b1461fe0..8301d951525f29 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -8,7 +8,7 @@
https://github.com/dotnet/msquic
d7db669b70f4dd67ec001c192f9809c218cab88b
-
+
https://github.com/dotnet/emsdk
f5349765b7af1970c5b25cce4ed278544907cbe0
diff --git a/eng/Versions.props b/eng/Versions.props
index 1c8ae0b1d33b0e..7f9f08fbe42740 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -178,7 +178,7 @@
11.1.0-alpha.1.21328.1
11.1.0-alpha.1.21328.1
- 6.0.0-preview.7.21330.1
- $(MicrosoftNETRuntimeEmscripten2023Nodewinx64Version)
+ 6.0.0-preview.7.21330.1
+ $(MicrosoftNETWorkloadEmscriptenManifest60100)
diff --git a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Manifest/WorkloadManifest.json.in b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Manifest/WorkloadManifest.json.in
index 4c50a08f007c82..eaf73dbd712be3 100644
--- a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Manifest/WorkloadManifest.json.in
+++ b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Manifest/WorkloadManifest.json.in
@@ -1,5 +1,8 @@
{
"version": "${WorkloadVersion}",
+ "depends-on": {
+ "Microsoft.NET.Workload.Emscripten": "${EmscriptenVersion}"
+ },
"workloads": {
"microsoft-net-sdk-blazorwebassembly-aot": {
"description": "Browser Runtime native performance tools",
@@ -11,7 +14,7 @@
"Microsoft.NET.Runtime.Emscripten.Python",
"Microsoft.NET.Runtime.Emscripten.Sdk"
],
- "extends": [ "microsoft-net-runtime-mono-tooling" ],
+ "extends": [ "microsoft-net-runtime-mono-tooling", "microsoft-net-sdk-emscripten" ],
"platforms": [ "win-x64", "linux-x64", "osx-x64", "osx-arm64" ]
},
"microsoft-net-runtime-android": {
@@ -44,11 +47,13 @@
"packs": [
"Microsoft.NETCore.App.Runtime.Mono.ios-arm",
"Microsoft.NETCore.App.Runtime.Mono.ios-arm64",
- "Microsoft.NETCore.App.Runtime.Mono.iossimulator",
+ "Microsoft.NETCore.App.Runtime.Mono.iossimulator-arm64",
+ "Microsoft.NETCore.App.Runtime.Mono.iossimulator-x64",
"Microsoft.NETCore.App.Runtime.Mono.iossimulator-x86",
"Microsoft.NETCore.App.Runtime.AOT.Cross.ios-arm",
"Microsoft.NETCore.App.Runtime.AOT.Cross.ios-arm64",
- "Microsoft.NETCore.App.Runtime.AOT.Cross.iossimulator",
+ "Microsoft.NETCore.App.Runtime.AOT.Cross.iossimulator-arm64",
+ "Microsoft.NETCore.App.Runtime.AOT.Cross.iossimulator-x64",
"Microsoft.NETCore.App.Runtime.AOT.Cross.iossimulator-x86"
],
"extends": [ "microsoft-net-runtime-mono-tooling" ],
@@ -59,7 +64,8 @@
"description": "MacCatalyst Mono Runtime and AOT Workload",
"packs": [
"Microsoft.NETCore.App.Runtime.Mono.maccatalyst",
- "Microsoft.NETCore.App.Runtime.AOT.Cross.maccatalyst"
+ "Microsoft.NETCore.App.Runtime.AOT.Cross.maccatalyst-arm64",
+ "Microsoft.NETCore.App.Runtime.AOT.Cross.maccatalyst-x64"
],
"extends": [ "microsoft-net-runtime-mono-tooling" ],
"platforms": [ "osx-arm64", "osx-x64" ]
@@ -69,9 +75,11 @@
"description": "tvOS Mono Runtime and AOT Workload",
"packs": [
"Microsoft.NETCore.App.Runtime.Mono.tvos-arm64",
- "Microsoft.NETCore.App.Runtime.Mono.tvossimulator",
+ "Microsoft.NETCore.App.Runtime.Mono.tvossimulator-arm64",
+ "Microsoft.NETCore.App.Runtime.Mono.tvossimulator-x64",
"Microsoft.NETCore.App.Runtime.AOT.Cross.tvos-arm64",
- "Microsoft.NETCore.App.Runtime.AOT.Cross.tvossimulator"
+ "Microsoft.NETCore.App.Runtime.AOT.Cross.tvossimulator-arm64",
+ "Microsoft.NETCore.App.Runtime.AOT.Cross.tvossimulator-x64"
],
"extends": [ "microsoft-net-runtime-mono-tooling" ],
"platforms": [ "osx-arm64", "osx-x64" ]
@@ -81,7 +89,7 @@
"description": "Shared native build tooling for Mono runtime",
"packs": [
"Microsoft.NET.Runtime.RuntimeConfigParser.Task",
- "Microsoft.NET.Runtime.MonoAOTCompiler.Task",
+ "Microsoft.NET.Runtime.MonoAOTCompiler.Task"
],
}
},
@@ -154,13 +162,13 @@
"osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.android-arm64"
}
},
- "Microsoft.NETCore.App.Runtime.Mono.maccatalyst": {
+ "Microsoft.NETCore.App.Runtime.Mono.maccatalyst-arm64": {
+ "kind": "framework",
+ "version": "${PackageVersion}",
+ },
+ "Microsoft.NETCore.App.Runtime.Mono.maccatalyst-x64": {
"kind": "framework",
"version": "${PackageVersion}",
- "alias-to": {
- "osx-arm64": "Microsoft.NETCore.App.Runtime.Mono.maccatalyst-arm64",
- "osx-x64": "Microsoft.NETCore.App.Runtime.Mono.maccatalyst-x64"
- }
},
"Microsoft.NETCore.App.Runtime.Mono.ios-arm" : {
"kind": "framework",
@@ -170,54 +178,67 @@
"kind": "framework",
"version": "${PackageVersion}"
},
- "Microsoft.NETCore.App.Runtime.Mono.iossimulator" : {
+ "Microsoft.NETCore.App.Runtime.Mono.iossimulator-arm64" : {
"kind": "framework",
- "version": "${PackageVersion}",
- "alias-to": {
- "osx-arm64": "Microsoft.NETCore.App.Runtime.Mono.iossimulator-arm64",
- "osx-x64": "Microsoft.NETCore.App.Runtime.Mono.iossimulator-x64"
- }
+ "version": "${PackageVersion}"
+ },
+ "Microsoft.NETCore.App.Runtime.Mono.iossimulator-x64" : {
+ "kind": "framework",
+ "version": "${PackageVersion}"
},
"Microsoft.NETCore.App.Runtime.Mono.iossimulator-x86" : {
"kind": "framework",
- "version": "${PackageVersion}",
- "alias-to": {
- "osx-x64": "Microsoft.NETCore.App.Runtime.Mono.iossimulator-x86"
- }
+ "version": "${PackageVersion}"
},
"Microsoft.NETCore.App.Runtime.AOT.Cross.tvos-arm64": {
"kind": "Sdk",
"version": "${PackageVersion}",
"alias-to": {
- "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.tvos-arm64",
"osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.tvos-arm64",
+ "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.tvos-arm64"
}
},
"Microsoft.NETCore.App.Runtime.Mono.tvos-arm64" : {
"kind": "framework",
"version": "${PackageVersion}"
},
- "Microsoft.NETCore.App.Runtime.Mono.tvossimulator" : {
+ "Microsoft.NETCore.App.Runtime.Mono.tvossimulator-arm64" : {
"kind": "framework",
+ "version": "${PackageVersion}"
+ },
+ "Microsoft.NETCore.App.Runtime.Mono.tvossimulator-x64" : {
+ "kind": "framework",
+ "version": "${PackageVersion}"
+ },
+ "Microsoft.NETCore.App.Runtime.AOT.Cross.maccatalyst-arm64": {
+ "kind": "Sdk",
"version": "${PackageVersion}",
"alias-to": {
- "osx-arm64": "Microsoft.NETCore.App.Runtime.Mono.tvossimulator-arm64",
- "osx-x64": "Microsoft.NETCore.App.Runtime.Mono.tvossimulator-x64"
+ "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.maccatalyst-arm64",
+ "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.maccatalyst-arm64"
}
},
- "Microsoft.NETCore.App.Runtime.AOT.Cross.maccatalyst": {
+ "Microsoft.NETCore.App.Runtime.AOT.Cross.maccatalyst-x64": {
"kind": "Sdk",
"version": "${PackageVersion}",
"alias-to": {
- "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.maccatalyst-arm64",
+ "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.maccatalyst-x64",
"osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.maccatalyst-x64"
}
},
- "Microsoft.NETCore.App.Runtime.AOT.Cross.tvossimulator": {
+ "Microsoft.NETCore.App.Runtime.AOT.Cross.tvossimulator-arm64": {
"kind": "Sdk",
"version": "${PackageVersion}",
"alias-to": {
"osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.tvossimulator-arm64",
+ "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.tvossimulator-arm64"
+ }
+ },
+ "Microsoft.NETCore.App.Runtime.AOT.Cross.tvossimulator-x64": {
+ "kind": "Sdk",
+ "version": "${PackageVersion}",
+ "alias-to": {
+ "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.tvossimulator-x64",
"osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.tvossimulator-x64"
}
},
@@ -234,14 +255,22 @@
"version": "${PackageVersion}",
"alias-to": {
"osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.ios-arm64",
- "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.ios-arm64",
+ "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.ios-arm64"
}
},
- "Microsoft.NETCore.App.Runtime.AOT.Cross.iossimulator": {
+ "Microsoft.NETCore.App.Runtime.AOT.Cross.iossimulator-arm64": {
"kind": "Sdk",
"version": "${PackageVersion}",
"alias-to": {
"osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.iossimulator-arm64",
+ "osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.iossimulator-arm64"
+ }
+ },
+ "Microsoft.NETCore.App.Runtime.AOT.Cross.iossimulator-x64": {
+ "kind": "Sdk",
+ "version": "${PackageVersion}",
+ "alias-to": {
+ "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.iossimulator-x64",
"osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.iossimulator-x64"
}
},
@@ -249,6 +278,7 @@
"kind": "Sdk",
"version": "${PackageVersion}",
"alias-to": {
+ "osx-arm64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.iossimulator-x86",
"osx-x64": "Microsoft.NETCore.App.Runtime.AOT.osx-x64.Cross.iossimulator-x86"
}
},
@@ -265,35 +295,6 @@
"Microsoft.NETCore.App.Runtime.Mono.browser-wasm" : {
"kind": "framework",
"version": "${PackageVersion}"
- },
- "Microsoft.NET.Runtime.Emscripten.Node" : {
- "kind": "Sdk",
- "version": "${EmscriptenVersion}",
- "alias-to": {
- "win-x64": "Microsoft.NET.Runtime.Emscripten.2.0.23.Node.win-x64",
- "linux-x64": "Microsoft.NET.Runtime.Emscripten.2.0.23.Node.linux-x64",
- "osx-x64": "Microsoft.NET.Runtime.Emscripten.2.0.23.Node.osx-x64",
- "osx-arm64": "Microsoft.NET.Runtime.Emscripten.2.0.23.Node.osx-x64"
- }
- },
- "Microsoft.NET.Runtime.Emscripten.Python" : {
- "kind": "Sdk",
- "version": "${EmscriptenVersion}",
- "alias-to": {
- "win-x64": "Microsoft.NET.Runtime.Emscripten.2.0.23.Python.win-x64",
- "osx-x64": "Microsoft.NET.Runtime.Emscripten.2.0.23.Python.osx-x64",
- "osx-arm64": "Microsoft.NET.Runtime.Emscripten.2.0.23.Python.osx-x64"
- }
- },
- "Microsoft.NET.Runtime.Emscripten.Sdk" : {
- "kind": "Sdk",
- "version": "${EmscriptenVersion}",
- "alias-to": {
- "win-x64": "Microsoft.NET.Runtime.Emscripten.2.0.23.Sdk.win-x64",
- "linux-x64": "Microsoft.NET.Runtime.Emscripten.2.0.23.Sdk.linux-x64",
- "osx-x64": "Microsoft.NET.Runtime.Emscripten.2.0.23.Sdk.osx-x64",
- "osx-arm64": "Microsoft.NET.Runtime.Emscripten.2.0.23.Sdk.osx-x64"
- }
}
}
-}
\ No newline at end of file
+}
diff --git a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Manifest/WorkloadManifest.targets b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Manifest/WorkloadManifest.targets
index ab039e9a716784..56650214b27598 100644
--- a/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Manifest/WorkloadManifest.targets
+++ b/src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Manifest/WorkloadManifest.targets
@@ -24,14 +24,17 @@
-
+
+
+
-
+
+
@@ -39,14 +42,12 @@
-
+
+
-
-
-