Merge pull request dotnet#31551 from dotnet/prkrishn/merge

Merge remote-tracking branch 'origin/release/6.0-preview3'
fvoronin · Apr 6, 2021 · c8035cd · c8035cd
2 parents d4f1805 + 4eb2a20
commit c8035cd
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 2 deletions.
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -285,10 +285,22 @@
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>4523fbfc78b78a797d662b7952ac674a3616ed7d</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="6.0.0-preview.4.21201.1">
+    <Dependency Name="Microsoft.NET.Runtime.Emscripten.2.0.12.Node.win-x64" Version="6.0.0-preview.4.21205.1">
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>4523fbfc78b78a797d662b7952ac674a3616ed7d</Sha>
     </Dependency>
+    <Dependency Name="Microsoft.NET.Runtime.Emscripten.2.0.12.Python.win-x64" Version="6.0.0-preview.4.21205.1">
+      <Uri>https://github.com/dotnet/runtime</Uri>
+      <Sha>245cd97e52d6082407cf3a6da6f5221d61be10fe</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.NET.Runtime.Emscripten.2.0.12.Sdk.win-x64" Version="6.0.0-preview.4.21205.1">
+      <Uri>https://github.com/dotnet/runtime</Uri>
+      <Sha>245cd97e52d6082407cf3a6da6f5221d61be10fe</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="6.0.0-preview.4.21201.1">
+      <Uri>https://github.com/dotnet/runtime</Uri>
+      <Sha>245cd97e52d6082407cf3a6da6f5221d61be10fe</Sha>
+    </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
     <!-- Listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->

diff --git a/eng/Versions.props b/eng/Versions.props
@@ -71,6 +71,9 @@
     <MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>6.0.0-preview.4.21201.1</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
     <MicrosoftNETRuntimeWebAssemblySdkVersion>6.0.0-preview.4.21201.1</MicrosoftNETRuntimeWebAssemblySdkVersion>
     <MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>6.0.0-preview.4.21201.1</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
+    <MicrosoftNETRuntimeEmscripten2012Nodewinx64Version>6.0.0-preview.4.21205.1</MicrosoftNETRuntimeEmscripten2012Nodewinx64Version>
+    <MicrosoftNETRuntimeEmscripten2012Pythonwinx64Version>6.0.0-preview.4.21205.1</MicrosoftNETRuntimeEmscripten2012Pythonwinx64Version>
+    <MicrosoftNETRuntimeEmscripten2012Sdkwinx64Version>6.0.0-preview.4.21205.1</MicrosoftNETRuntimeEmscripten2012Sdkwinx64Version>
     <MicrosoftNETCoreBrowserDebugHostTransportVersion>6.0.0-preview.4.21201.1</MicrosoftNETCoreBrowserDebugHostTransportVersion>
     <MicrosoftWin32RegistryVersion>6.0.0-preview.4.21201.1</MicrosoftWin32RegistryVersion>
     <MicrosoftExtensionsCachingAbstractionsVersion>6.0.0-preview.4.21201.1</MicrosoftExtensionsCachingAbstractionsVersion>

diff --git 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);
       </_WorkloadManifestProperties>
 
       <WorkloadManifestPath>$(IntermediateOutputPath)WorkloadManifest.json</WorkloadManifestPath>

diff --git 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
@@ -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>