Skip to content

Commit b14188b

Browse files
pranavkmpranavkm
authored
Use Emscripten SDKs in WASM workload (#31259)
1 parent 4f86d11 commit b14188b

File tree

5 files changed

+61
-7
lines changed

5 files changed

+61
-7
lines changed

‎eng/Version.Details.xml

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -265,11 +265,11 @@
265265
<Uri>https://github.com/dotnet/runtime</Uri>
266266
<Sha>0f64b267ac0552f07b06f18103581b880c8c53c6</Sha>
267267
</Dependency>
268-
<Dependency Name="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="6.0.0-preview.3.21167.1">
268+
<Dependency Name="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="6.0.0-preview.3.21174.2">
269269
<Uri>https://github.com/dotnet/runtime</Uri>
270270
<Sha>0f64b267ac0552f07b06f18103581b880c8c53c6</Sha>
271271
</Dependency>
272-
<Dependency Name="Microsoft.NET.Runtime.WebAssembly.Sdk" Version="6.0.0-preview.3.21167.1">
272+
<Dependency Name="Microsoft.NET.Runtime.WebAssembly.Sdk" Version="6.0.0-preview.3.21174.2">
273273
<Uri>https://github.com/dotnet/runtime</Uri>
274274
<Sha>0f64b267ac0552f07b06f18103581b880c8c53c6</Sha>
275275
</Dependency>
@@ -281,9 +281,21 @@
281281
<Uri>https://github.com/dotnet/runtime</Uri>
282282
<Sha>0f64b267ac0552f07b06f18103581b880c8c53c6</Sha>
283283
</Dependency>
284-
<Dependency Name="Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm" Version="6.0.0-preview.3.21167.1">
284+
<Dependency Name="Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm" Version="6.0.0-preview.3.21174.2">
285285
<Uri>https://github.com/dotnet/runtime</Uri>
286286
<Sha>0f64b267ac0552f07b06f18103581b880c8c53c6</Sha>
287+
</Dependency>
288+
<Dependency Name="Microsoft.NET.Runtime.Emscripten.2.0.12.Node.win-x64" Version="6.0.0-preview.3.21174.2">
289+
<Uri>https://github.com/dotnet/runtime</Uri>
290+
<Sha>bcc7e0e0ce1758322015675356efc121b211e312</Sha>
291+
</Dependency>
292+
<Dependency Name="Microsoft.NET.Runtime.Emscripten.2.0.12.Python.win-x64" Version="6.0.0-preview.3.21174.2">
293+
<Uri>https://github.com/dotnet/runtime</Uri>
294+
<Sha>bcc7e0e0ce1758322015675356efc121b211e312</Sha>
295+
</Dependency>
296+
<Dependency Name="Microsoft.NET.Runtime.Emscripten.2.0.12.Sdk.win-x64" Version="6.0.0-preview.3.21174.2">
297+
<Uri>https://github.com/dotnet/runtime</Uri>
298+
<Sha>bcc7e0e0ce1758322015675356efc121b211e312</Sha>
287299
</Dependency>
288300
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="6.0.0-preview.3.21167.1">
289301
<Uri>https://github.com/dotnet/runtime</Uri>

‎eng/Versions.props

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,12 @@
6868
<MicrosoftExtensionsDependencyModelVersion>6.0.0-preview.3.21167.1</MicrosoftExtensionsDependencyModelVersion>
6969
<MicrosoftNETCoreAppRefVersion>6.0.0-preview.3.21167.1</MicrosoftNETCoreAppRefVersion>
7070
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.0-preview.3.21167.1</MicrosoftNETCoreAppRuntimewinx64Version>
71-
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>6.0.0-preview.3.21167.1</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
72-
<MicrosoftNETRuntimeWebAssemblySdkVersion>6.0.0-preview.3.21167.1</MicrosoftNETRuntimeWebAssemblySdkVersion>
73-
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>6.0.0-preview.3.21167.1</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
71+
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>6.0.0-preview.3.21174.2</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
72+
<MicrosoftNETRuntimeWebAssemblySdkVersion>6.0.0-preview.3.21174.2</MicrosoftNETRuntimeWebAssemblySdkVersion>
73+
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>6.0.0-preview.3.21174.2</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
74+
<MicrosoftNETRuntimeEmscripten2012Nodewinx64Version>6.0.0-preview.3.21174.2</MicrosoftNETRuntimeEmscripten2012Nodewinx64Version>
75+
<MicrosoftNETRuntimeEmscripten2012Pythonwinx64Version>6.0.0-preview.3.21174.2</MicrosoftNETRuntimeEmscripten2012Pythonwinx64Version>
76+
<MicrosoftNETRuntimeEmscripten2012Sdkwinx64Version>6.0.0-preview.3.21174.2</MicrosoftNETRuntimeEmscripten2012Sdkwinx64Version>
7477
<MicrosoftNETCoreBrowserDebugHostTransportVersion>6.0.0-preview.3.21167.1</MicrosoftNETCoreBrowserDebugHostTransportVersion>
7578
<MicrosoftWin32RegistryVersion>6.0.0-preview.3.21167.1</MicrosoftWin32RegistryVersion>
7679
<MicrosoftExtensionsCachingAbstractionsVersion>6.0.0-preview.3.21167.1</MicrosoftExtensionsCachingAbstractionsVersion>

‎src/Components/WebAssembly/BlazorManifest/src/BlazorManifest.csproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
MicrosoftNETRuntimeMonoAOTCompilerTaskVersion=$(MicrosoftNETRuntimeMonoAOTCompilerTaskVersion);
1818
MicrosoftNETRuntimeWebAssemblySdkVersion=$(MicrosoftNETRuntimeWebAssemblySdkVersion);
1919
MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion=$(MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion);
20+
MicrosoftNETRuntimeEmscripten2012Nodewinx64Version=$(MicrosoftNETRuntimeEmscripten2012Nodewinx64Version);
21+
MicrosoftNETRuntimeEmscripten2012Pythonwinx64Version=$(MicrosoftNETRuntimeEmscripten2012Pythonwinx64Version);
22+
MicrosoftNETRuntimeEmscripten2012Sdkwinx64Version=$(MicrosoftNETRuntimeEmscripten2012Sdkwinx64Version);
2023
</_WorkloadManifestProperties>
2124

2225
<WorkloadManifestPath>$(IntermediateOutputPath)WorkloadManifest.json</WorkloadManifestPath>

‎src/Components/WebAssembly/BlazorManifest/src/WorkloadManifest.json.in

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@
66
"packs": [
77
"Microsoft.NET.Runtime.MonoAOTCompiler.Task",
88
"Microsoft.NET.Runtime.WebAssembly.Sdk",
9-
"Microsoft.Netcore.App.Runtime.Aot.Cross.browser-wasm"
9+
"Microsoft.Netcore.App.Runtime.Aot.Cross.browser-wasm",
10+
"Microsoft.NET.Runtime.Emscripten.Node",
11+
"Microsoft.NET.Runtime.Emscripten.Python",
12+
"Microsoft.NET.Runtime.Emscripten.Sdk"
1013
]
1114
}
1215
},
@@ -28,6 +31,36 @@
2831
"linux-x64": "microsoft.netcore.app.runtime.aot.linux-x64.cross.browser-wasm",
2932
"osx-x64": "microsoft.netcore.app.runtime.aot.osx-x64.cross.browser-wasm"
3033
}
34+
},
35+
"Microsoft.NET.Runtime.Emscripten.Node" : {
36+
"kind": "Sdk",
37+
"version": "${MicrosoftNETRuntimeEmscripten2012Nodewinx64Version}",
38+
"alias-to": {
39+
"win-x86": "Microsoft.NET.Runtime.Emscripten.2.0.12.Node.win-x86",
40+
"win-x64": "Microsoft.NET.Runtime.Emscripten.2.0.12.Node.win-x64",
41+
"linux-x64": "Microsoft.NET.Runtime.Emscripten.2.0.12.Node.linux-x64",
42+
"osx-x64": "Microsoft.NET.Runtime.Emscripten.2.0.12.Node.osx-x64"
43+
}
44+
},
45+
"Microsoft.NET.Runtime.Emscripten.Python" : {
46+
"kind": "Sdk",
47+
"version": "${MicrosoftNETRuntimeEmscripten2012Pythonwinx64Version}",
48+
"alias-to": {
49+
"win-x86": "Microsoft.NET.Runtime.Emscripten.2.0.12.Python.win-x86",
50+
"win-x64": "Microsoft.NET.Runtime.Emscripten.2.0.12.Python.win-x64",
51+
"linux-x64": "Microsoft.NET.Runtime.Emscripten.2.0.12.Python.linux-x64",
52+
"osx-x64": "Microsoft.NET.Runtime.Emscripten.2.0.12.Python.osx-x64"
53+
}
54+
},
55+
"Microsoft.NET.Runtime.Emscripten.Sdk" : {
56+
"kind": "Sdk",
57+
"version": "${MicrosoftNETRuntimeEmscripten2012Sdkwinx64Version}",
58+
"alias-to": {
59+
"win-x86": "Microsoft.NET.Runtime.Emscripten.2.0.12.Sdk.win-x86",
60+
"win-x64": "Microsoft.NET.Runtime.Emscripten.2.0.12.Sdk.win-x64",
61+
"linux-x64": "Microsoft.NET.Runtime.Emscripten.2.0.12.Sdk.linux-x64",
62+
"osx-x64": "Microsoft.NET.Runtime.Emscripten.2.0.12.Sdk.osx-x64"
63+
}
3164
}
3265
}
3366
}

‎src/Components/WebAssembly/BlazorManifest/src/WorkloadManifest.targets

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,8 @@
77
<Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.MonoAOTCompiler.Task" />
88
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Runtime.WebAssembly.Sdk" />
99
<Import Project="Sdk.props" Sdk="Microsoft.Netcore.App.Runtime.Aot.Cross.browser-wasm" />
10+
<Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.Emscripten.Python" />
11+
<Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.Emscripten.Node" />
12+
<Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.Emscripten.Sdk" />
1013
</ImportGroup>
1114
</Project>

0 commit comments

Comments
 (0)