Skip to content

Commit 4eb2a20

Browse files
pranavkmpranavkm
committed
Merge remote-tracking branch 'origin/release/6.0-preview3'
2 parents 79b419c + 718171e commit 4eb2a20

File tree

5 files changed

+56
-2
lines changed

5 files changed

+56
-2
lines changed

‎eng/Version.Details.xml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,10 +285,22 @@
285285
<Uri>https://github.com/dotnet/runtime</Uri>
286286
<Sha>4523fbfc78b78a797d662b7952ac674a3616ed7d</Sha>
287287
</Dependency>
288-
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="6.0.0-preview.4.21201.1">
288+
<Dependency Name="Microsoft.NET.Runtime.Emscripten.2.0.12.Node.win-x64" Version="6.0.0-preview.4.21205.1">
289289
<Uri>https://github.com/dotnet/runtime</Uri>
290290
<Sha>4523fbfc78b78a797d662b7952ac674a3616ed7d</Sha>
291291
</Dependency>
292+
<Dependency Name="Microsoft.NET.Runtime.Emscripten.2.0.12.Python.win-x64" Version="6.0.0-preview.4.21205.1">
293+
<Uri>https://github.com/dotnet/runtime</Uri>
294+
<Sha>245cd97e52d6082407cf3a6da6f5221d61be10fe</Sha>
295+
</Dependency>
296+
<Dependency Name="Microsoft.NET.Runtime.Emscripten.2.0.12.Sdk.win-x64" Version="6.0.0-preview.4.21205.1">
297+
<Uri>https://github.com/dotnet/runtime</Uri>
298+
<Sha>245cd97e52d6082407cf3a6da6f5221d61be10fe</Sha>
299+
</Dependency>
300+
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="6.0.0-preview.4.21201.1">
301+
<Uri>https://github.com/dotnet/runtime</Uri>
302+
<Sha>245cd97e52d6082407cf3a6da6f5221d61be10fe</Sha>
303+
</Dependency>
292304
</ProductDependencies>
293305
<ToolsetDependencies>
294306
<!-- Listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->

‎eng/Versions.props

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,9 @@
7171
<MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>6.0.0-preview.4.21201.1</MicrosoftNETRuntimeMonoAOTCompilerTaskVersion>
7272
<MicrosoftNETRuntimeWebAssemblySdkVersion>6.0.0-preview.4.21201.1</MicrosoftNETRuntimeWebAssemblySdkVersion>
7373
<MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>6.0.0-preview.4.21201.1</MicrosoftNETCoreAppRuntimeAOTwinx64CrossbrowserwasmVersion>
74+
<MicrosoftNETRuntimeEmscripten2012Nodewinx64Version>6.0.0-preview.4.21205.1</MicrosoftNETRuntimeEmscripten2012Nodewinx64Version>
75+
<MicrosoftNETRuntimeEmscripten2012Pythonwinx64Version>6.0.0-preview.4.21205.1</MicrosoftNETRuntimeEmscripten2012Pythonwinx64Version>
76+
<MicrosoftNETRuntimeEmscripten2012Sdkwinx64Version>6.0.0-preview.4.21205.1</MicrosoftNETRuntimeEmscripten2012Sdkwinx64Version>
7477
<MicrosoftNETCoreBrowserDebugHostTransportVersion>6.0.0-preview.4.21201.1</MicrosoftNETCoreBrowserDebugHostTransportVersion>
7578
<MicrosoftWin32RegistryVersion>6.0.0-preview.4.21201.1</MicrosoftWin32RegistryVersion>
7679
<MicrosoftExtensionsCachingAbstractionsVersion>6.0.0-preview.4.21201.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)