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 cdb313d0a06547..5240e72cbb270b 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -180,7 +180,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..059efeed70ceaa 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": { @@ -266,34 +269,5 @@ "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..4176041469bc17 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 @@ -44,9 +44,6 @@ - - -