Skip to content

Commit 492abbe

Browse files
committed
Merge in 'release/6.0' changes
2 parents d7b9518 + f1bfdda commit 492abbe

File tree

3 files changed

+10
-9
lines changed

3 files changed

+10
-9
lines changed

NuGet.config

+1
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
<clear />
1010
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
1111
<!-- Begin: Package sources from dotnet-emsdk -->
12+
<add key="darc-pub-dotnet-emsdk-d8bc162" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-d8bc162c/nuget/v3/index.json" />
1213
<!-- End: Package sources from dotnet-emsdk -->
1314
<!-- Begin: Package sources from dotnet-wcf -->
1415
<!-- End: Package sources from dotnet-wcf -->

eng/Version.Details.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@
88
<Uri>https://github.com/dotnet/msquic</Uri>
99
<Sha>7312355e44fd230b7aa26c7190f3870391751476</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.100" Version="6.0.23">
11+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.100" Version="6.0.25">
1212
<Uri>https://github.com/dotnet/emsdk</Uri>
13-
<Sha>0b73b536f6e0d0a6143387439c3308db4db9fdfe</Sha>
13+
<Sha>d8bc162ccf7ce14fdbec9c2c50d6e856a7063c91</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.300" Version="6.0.23">
15+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.300" Version="6.0.25">
1616
<Uri>https://github.com/dotnet/emsdk</Uri>
17-
<Sha>0b73b536f6e0d0a6143387439c3308db4db9fdfe</Sha>
17+
<Sha>d8bc162ccf7ce14fdbec9c2c50d6e856a7063c91</Sha>
1818
</Dependency>
19-
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.400" Version="6.0.23">
19+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.400" Version="6.0.25">
2020
<Uri>https://github.com/dotnet/emsdk</Uri>
21-
<Sha>0b73b536f6e0d0a6143387439c3308db4db9fdfe</Sha>
21+
<Sha>d8bc162ccf7ce14fdbec9c2c50d6e856a7063c91</Sha>
2222
</Dependency>
2323
<Dependency Name="System.ServiceModel.Primitives" Version="4.9.0">
2424
<Uri>https://github.com/dotnet/wcf</Uri>

eng/Versions.props

+3-3
Original file line numberDiff line numberDiff line change
@@ -176,9 +176,9 @@
176176
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>11.1.0-alpha.1.21416.1</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMSdkVersion>
177177
<runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>11.1.0-alpha.1.21416.1</runtimeosx1012x64MicrosoftNETCoreRuntimeMonoLLVMToolsVersion>
178178
<!-- emscripten / Node -->
179-
<MicrosoftNETWorkloadEmscriptenManifest60100Version>6.0.23</MicrosoftNETWorkloadEmscriptenManifest60100Version>
180-
<MicrosoftNETWorkloadEmscriptenManifest60300Version>6.0.23</MicrosoftNETWorkloadEmscriptenManifest60300Version>
181-
<MicrosoftNETWorkloadEmscriptenManifest60400Version>6.0.23</MicrosoftNETWorkloadEmscriptenManifest60400Version>
179+
<MicrosoftNETWorkloadEmscriptenManifest60100Version>6.0.25</MicrosoftNETWorkloadEmscriptenManifest60100Version>
180+
<MicrosoftNETWorkloadEmscriptenManifest60300Version>6.0.25</MicrosoftNETWorkloadEmscriptenManifest60300Version>
181+
<MicrosoftNETWorkloadEmscriptenManifest60400Version>6.0.25</MicrosoftNETWorkloadEmscriptenManifest60400Version>
182182
<MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEmscriptenManifest60100Version)</MicrosoftNETRuntimeEmscriptenVersion>
183183
<!-- workloads -->
184184
<SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion>

0 commit comments

Comments
 (0)