Skip to content

Use Emscripten SDKs in WASM workload #31259

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 26, 2021
Merged

Use Emscripten SDKs in WASM workload #31259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,11 +265,11 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>0f64b267ac0552f07b06f18103581b880c8c53c6</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="6.0.0-preview.3.21167.1">
<Dependency Name="Microsoft.NET.Runtime.MonoAOTCompiler.Task" Version="6.0.0-preview.3.21174.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>0f64b267ac0552f07b06f18103581b880c8c53c6</Sha>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Recommend aligning the SHAs w/ #31255 to avoid conflicts between this and that. But, I agree it'll be better all 'round if that goes in first (with new versions from dotnet/runtime).

</Dependency>
<Dependency Name="Microsoft.NET.Runtime.WebAssembly.Sdk" Version="6.0.0-preview.3.21167.1">
<Dependency Name="Microsoft.NET.Runtime.WebAssembly.Sdk" Version="6.0.0-preview.3.21174.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>0f64b267ac0552f07b06f18103581b880c8c53c6</Sha>
</Dependency>
Expand All @@ -281,9 +281,21 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>0f64b267ac0552f07b06f18103581b880c8c53c6</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm" Version="6.0.0-preview.3.21167.1">
<Dependency Name="Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm" Version="6.0.0-preview.3.21174.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>0f64b267ac0552f07b06f18103581b880c8c53c6</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Runtime.Emscripten.2.0.12.Node.win-x64" Version="6.0.0-preview.3.21174.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>bcc7e0e0ce1758322015675356efc121b211e312</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Runtime.Emscripten.2.0.12.Python.win-x64" Version="6.0.0-preview.3.21174.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>bcc7e0e0ce1758322015675356efc121b211e312</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Runtime.Emscripten.2.0.12.Sdk.win-x64" Version="6.0.0-preview.3.21174.2">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>bcc7e0e0ce1758322015675356efc121b211e312</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="6.0.0-preview.3.21167.1">
<Uri>https://github.com/dotnet/runtime</Uri>
Expand Down
9 changes: 6 additions & 3 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,12 @@
<MicrosoftExtensionsDependencyModelVersion>6.0.0-preview.3.21167.1</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftNETCoreAppRefVersion>6.0.0-preview.3.21167.1</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.0-preview.3.21167.1</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>6.0.0-preview.3.21167.1</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
<MicrosoftNETRuntimeWebAssemblySdkVersion>6.0.0-preview.3.21167.1</MicrosoftNETRuntimeWebAssemblySdkVersion>
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>6.0.0-preview.3.21167.1</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>6.0.0-preview.3.21174.2</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
<MicrosoftNETRuntimeWebAssemblySdkVersion>6.0.0-preview.3.21174.2</MicrosoftNETRuntimeWebAssemblySdkVersion>
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>6.0.0-preview.3.21174.2</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
<MicrosoftNETRuntimeEmscripten2012Nodewinx64Version>6.0.0-preview.3.21174.2</MicrosoftNETRuntimeEmscripten2012Nodewinx64Version>
<MicrosoftNETRuntimeEmscripten2012Pythonwinx64Version>6.0.0-preview.3.21174.2</MicrosoftNETRuntimeEmscripten2012Pythonwinx64Version>
<MicrosoftNETRuntimeEmscripten2012Sdkwinx64Version>6.0.0-preview.3.21174.2</MicrosoftNETRuntimeEmscripten2012Sdkwinx64Version>
<MicrosoftNETCoreBrowserDebugHostTransportVersion>6.0.0-preview.3.21167.1</MicrosoftNETCoreBrowserDebugHostTransportVersion>
<MicrosoftWin32RegistryVersion>6.0.0-preview.3.21167.1</MicrosoftWin32RegistryVersion>
<MicrosoftExtensionsCachingAbstractionsVersion>6.0.0-preview.3.21167.1</MicrosoftExtensionsCachingAbstractionsVersion>
Expand Down
3 changes: 3 additions & 0 deletions src/Components/WebAssembly/BlazorManifest/src/BlazorManifest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,9 @@
MicrosoftNETRuntimeMonoAOTCompilerTaskVersion=$(MicrosoftNETRuntimeMonoAOTCompilerTaskVersion);
MicrosoftNETRuntimeWebAssemblySdkVersion=$(MicrosoftNETRuntimeWebAssemblySdkVersion);
MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion=$(MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion);
MicrosoftNETRuntimeEmscripten2012Nodewinx64Version=$(MicrosoftNETRuntimeEmscripten2012Nodewinx64Version);
MicrosoftNETRuntimeEmscripten2012Pythonwinx64Version=$(MicrosoftNETRuntimeEmscripten2012Pythonwinx64Version);
MicrosoftNETRuntimeEmscripten2012Sdkwinx64Version=$(MicrosoftNETRuntimeEmscripten2012Sdkwinx64Version);
</_WorkloadManifestProperties>

<WorkloadManifestPath>$(IntermediateOutputPath)WorkloadManifest.json</WorkloadManifestPath>
Expand Down
35 changes: 34 additions & 1 deletion src/Components/WebAssembly/BlazorManifest/src/WorkloadManifest.json.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@
"packs": [
"Microsoft.NET.Runtime.MonoAOTCompiler.Task",
"Microsoft.NET.Runtime.WebAssembly.Sdk",
"Microsoft.Netcore.App.Runtime.Aot.Cross.browser-wasm"
"Microsoft.Netcore.App.Runtime.Aot.Cross.browser-wasm",
"Microsoft.NET.Runtime.Emscripten.Node",
"Microsoft.NET.Runtime.Emscripten.Python",
"Microsoft.NET.Runtime.Emscripten.Sdk"
]
}
},
Expand All @@ -28,6 +31,36 @@
"linux-x64": "microsoft.netcore.app.runtime.aot.linux-x64.cross.browser-wasm",
"osx-x64": "microsoft.netcore.app.runtime.aot.osx-x64.cross.browser-wasm"
}
},
"Microsoft.NET.Runtime.Emscripten.Node" : {
"kind": "Sdk",
"version": "${MicrosoftNETRuntimeEmscripten2012Nodewinx64Version}",
"alias-to": {
"win-x86": "Microsoft.NET.Runtime.Emscripten.2.0.12.Node.win-x86",
"win-x64": "Microsoft.NET.Runtime.Emscripten.2.0.12.Node.win-x64",
"linux-x64": "Microsoft.NET.Runtime.Emscripten.2.0.12.Node.linux-x64",
"osx-x64": "Microsoft.NET.Runtime.Emscripten.2.0.12.Node.osx-x64"
}
},
"Microsoft.NET.Runtime.Emscripten.Python" : {
"kind": "Sdk",
"version": "${MicrosoftNETRuntimeEmscripten2012Pythonwinx64Version}",
"alias-to": {
"win-x86": "Microsoft.NET.Runtime.Emscripten.2.0.12.Python.win-x86",
"win-x64": "Microsoft.NET.Runtime.Emscripten.2.0.12.Python.win-x64",
"linux-x64": "Microsoft.NET.Runtime.Emscripten.2.0.12.Python.linux-x64",
"osx-x64": "Microsoft.NET.Runtime.Emscripten.2.0.12.Python.osx-x64"
}
},
"Microsoft.NET.Runtime.Emscripten.Sdk" : {
"kind": "Sdk",
"version": "${MicrosoftNETRuntimeEmscripten2012Sdkwinx64Version}",
"alias-to": {
"win-x86": "Microsoft.NET.Runtime.Emscripten.2.0.12.Sdk.win-x86",
"win-x64": "Microsoft.NET.Runtime.Emscripten.2.0.12.Sdk.win-x64",
"linux-x64": "Microsoft.NET.Runtime.Emscripten.2.0.12.Sdk.linux-x64",
"osx-x64": "Microsoft.NET.Runtime.Emscripten.2.0.12.Sdk.osx-x64"
}
}
}
}
3 changes: 3 additions & 0 deletions src/Components/WebAssembly/BlazorManifest/src/WorkloadManifest.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,8 @@
<Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.MonoAOTCompiler.Task" />
<Import Project="Sdk.targets" Sdk="Microsoft.NET.Runtime.WebAssembly.Sdk" />
<Import Project="Sdk.props" Sdk="Microsoft.Netcore.App.Runtime.Aot.Cross.browser-wasm" />
<Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.Emscripten.Python" />
<Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.Emscripten.Node" />
<Import Project="Sdk.props" Sdk="Microsoft.NET.Runtime.Emscripten.Sdk" />
</ImportGroup>
</Project>