Skip to content

Commit 331078a

Browse files
authored
Use the emsdk workload manifest for the emscripten packages (#55110)
1 parent 1f547ac commit 331078a

File tree

4 files changed

+7
-36
lines changed

4 files changed

+7
-36
lines changed

eng/Version.Details.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<Uri>https://github.com/dotnet/msquic</Uri>
99
<Sha>d7db669b70f4dd67ec001c192f9809c218cab88b</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.NET.Runtime.Emscripten.2.0.23.Node.win-x64" Version="6.0.0-preview.7.21330.1">
11+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.100" Version="6.0.0-preview.7.21330.1">
1212
<Uri>https://github.com/dotnet/emsdk</Uri>
1313
<Sha>f5349765b7af1970c5b25cce4ed278544907cbe0</Sha>
1414
</Dependency>

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@
180180
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.21328.1</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
181181
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.21328.1</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
182182
<!-- emscripten / Node -->
183-
<MicrosoftNETRuntimeEmscripten2023Nodewinx64Version>6.0.0-preview.7.21330.1</MicrosoftNETRuntimeEmscripten2023Nodewinx64Version>
184-
<MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETRuntimeEmscripten2023Nodewinx64Version)</MicrosoftNETRuntimeEmscriptenVersion>
183+
<MicrosoftNETWorkloadEmscriptenManifest60100>6.0.0-preview.7.21330.1</MicrosoftNETWorkloadEmscriptenManifest60100>
184+
<MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEmscriptenManifest60100)</MicrosoftNETRuntimeEmscriptenVersion>
185185
</PropertyGroup>
186186
</Project>

src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Manifest/WorkloadManifest.json.in

Lines changed: 4 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
{
22
"version": "${WorkloadVersion}",
3+
"depends-on": {
4+
"Microsoft.NET.Workload.Emscripten": "${EmscriptenVersion}"
5+
},
36
"workloads": {
47
"microsoft-net-sdk-blazorwebassembly-aot": {
58
"description": "Browser Runtime native performance tools",
@@ -11,7 +14,7 @@
1114
"Microsoft.NET.Runtime.Emscripten.Python",
1215
"Microsoft.NET.Runtime.Emscripten.Sdk"
1316
],
14-
"extends": [ "microsoft-net-runtime-mono-tooling" ],
17+
"extends": [ "microsoft-net-runtime-mono-tooling", "microsoft-net-sdk-emscripten" ],
1518
"platforms": [ "win-x64", "linux-x64", "osx-x64", "osx-arm64" ]
1619
},
1720
"microsoft-net-runtime-android": {
@@ -266,34 +269,5 @@
266269
"kind": "framework",
267270
"version": "${PackageVersion}"
268271
},
269-
"Microsoft.NET.Runtime.Emscripten.Node" : {
270-
"kind": "Sdk",
271-
"version": "${EmscriptenVersion}",
272-
"alias-to": {
273-
"win-x64": "Microsoft.NET.Runtime.Emscripten.2.0.23.Node.win-x64",
274-
"linux-x64": "Microsoft.NET.Runtime.Emscripten.2.0.23.Node.linux-x64",
275-
"osx-x64": "Microsoft.NET.Runtime.Emscripten.2.0.23.Node.osx-x64",
276-
"osx-arm64": "Microsoft.NET.Runtime.Emscripten.2.0.23.Node.osx-x64"
277-
}
278-
},
279-
"Microsoft.NET.Runtime.Emscripten.Python" : {
280-
"kind": "Sdk",
281-
"version": "${EmscriptenVersion}",
282-
"alias-to": {
283-
"win-x64": "Microsoft.NET.Runtime.Emscripten.2.0.23.Python.win-x64",
284-
"osx-x64": "Microsoft.NET.Runtime.Emscripten.2.0.23.Python.osx-x64",
285-
"osx-arm64": "Microsoft.NET.Runtime.Emscripten.2.0.23.Python.osx-x64"
286-
}
287-
},
288-
"Microsoft.NET.Runtime.Emscripten.Sdk" : {
289-
"kind": "Sdk",
290-
"version": "${EmscriptenVersion}",
291-
"alias-to": {
292-
"win-x64": "Microsoft.NET.Runtime.Emscripten.2.0.23.Sdk.win-x64",
293-
"linux-x64": "Microsoft.NET.Runtime.Emscripten.2.0.23.Sdk.linux-x64",
294-
"osx-x64": "Microsoft.NET.Runtime.Emscripten.2.0.23.Sdk.osx-x64",
295-
"osx-arm64": "Microsoft.NET.Runtime.Emscripten.2.0.23.Sdk.osx-x64"
296-
}
297-
}
298272
}
299273
}

src/mono/nuget/Microsoft.NET.Workload.Mono.Toolchain.Manifest/WorkloadManifest.targets

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,6 @@
4444

4545
<ImportGroup Condition="'$(RuntimeIdentifier)' == 'browser-wasm' and '$(UsingBrowserRuntimeWorkload)' == 'true'">
4646
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Runtime.WebAssembly.Sdk" />
47-
<Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.Emscripten.Python" Condition="!$([MSBuild]::IsOsPlatform('Linux'))" />
48-
<Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.Emscripten.Node" />
49-
<Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.Emscripten.Sdk" />
5047
<Import Project="Sdk.props" Sdk="Microsoft.NETCore.App.Runtime.AOT.Cross.browser-wasm" />
5148
</ImportGroup>
5249
</Project>

0 commit comments

Comments
 (0)