diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9e611651ba9d..40b513654987 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -285,10 +285,22 @@ https://github.com/dotnet/runtime 4523fbfc78b78a797d662b7952ac674a3616ed7d - + https://github.com/dotnet/runtime 4523fbfc78b78a797d662b7952ac674a3616ed7d + + https://github.com/dotnet/runtime + 245cd97e52d6082407cf3a6da6f5221d61be10fe + + + https://github.com/dotnet/runtime + 245cd97e52d6082407cf3a6da6f5221d61be10fe + + + https://github.com/dotnet/runtime + 245cd97e52d6082407cf3a6da6f5221d61be10fe + diff --git a/eng/Versions.props b/eng/Versions.props index 2a0e3b8a0cf0..dffa638e310d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -71,6 +71,9 @@ 6.0.0-preview.4.21201.1 6.0.0-preview.4.21201.1 6.0.0-preview.4.21201.1 + 6.0.0-preview.4.21205.1 + 6.0.0-preview.4.21205.1 + 6.0.0-preview.4.21205.1 6.0.0-preview.4.21201.1 6.0.0-preview.4.21201.1 6.0.0-preview.4.21201.1 diff --git a/src/Components/WebAssembly/BlazorManifest/src/BlazorManifest.csproj b/src/Components/WebAssembly/BlazorManifest/src/BlazorManifest.csproj index 57cca7edfb56..1db6deb684b6 100644 --- a/src/Components/WebAssembly/BlazorManifest/src/BlazorManifest.csproj +++ b/src/Components/WebAssembly/BlazorManifest/src/BlazorManifest.csproj @@ -17,6 +17,9 @@ MicrosoftNETRuntimeMonoAOTCompilerTaskVersion=$(MicrosoftNETRuntimeMonoAOTCompilerTaskVersion); MicrosoftNETRuntimeWebAssemblySdkVersion=$(MicrosoftNETRuntimeWebAssemblySdkVersion); MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion=$(MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion); + MicrosoftNETRuntimeEmscripten2012Nodewinx64Version=$(MicrosoftNETRuntimeEmscripten2012Nodewinx64Version); + MicrosoftNETRuntimeEmscripten2012Pythonwinx64Version=$(MicrosoftNETRuntimeEmscripten2012Pythonwinx64Version); + MicrosoftNETRuntimeEmscripten2012Sdkwinx64Version=$(MicrosoftNETRuntimeEmscripten2012Sdkwinx64Version); $(IntermediateOutputPath)WorkloadManifest.json diff --git a/src/Components/WebAssembly/BlazorManifest/src/WorkloadManifest.json.in b/src/Components/WebAssembly/BlazorManifest/src/WorkloadManifest.json.in index e35868204057..39badc2bd2e5 100644 --- a/src/Components/WebAssembly/BlazorManifest/src/WorkloadManifest.json.in +++ b/src/Components/WebAssembly/BlazorManifest/src/WorkloadManifest.json.in @@ -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" ] } }, @@ -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" + } } } } diff --git a/src/Components/WebAssembly/BlazorManifest/src/WorkloadManifest.targets b/src/Components/WebAssembly/BlazorManifest/src/WorkloadManifest.targets index f80574015b06..a0c7df21e7c1 100644 --- a/src/Components/WebAssembly/BlazorManifest/src/WorkloadManifest.targets +++ b/src/Components/WebAssembly/BlazorManifest/src/WorkloadManifest.targets @@ -7,5 +7,8 @@ + + +