Skip to content

Commit 80de56d

Browse files
committed
Merge in 'release/6.0' changes
2 parents 32bc9e9 + a43d69f commit 80de56d

File tree

3 files changed

+10
-13
lines changed

3 files changed

+10
-13
lines changed

NuGet.config

+1-4
Original file line numberDiff line numberDiff line change
@@ -9,10 +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-5ccc36f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-5ccc36f5/nuget/v3/index.json" />
13-
<add key="darc-pub-dotnet-emsdk-5ccc36f-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-5ccc36f5-2/nuget/v3/index.json" />
14-
<add key="darc-pub-dotnet-emsdk-5ccc36f-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-5ccc36f5-1/nuget/v3/index.json" />
15-
<add key="darc-pub-dotnet-emsdk-5460e2c" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-5460e2cb/nuget/v3/index.json" />
12+
<add key="darc-pub-dotnet-emsdk-a9f209f" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-a9f209f8/nuget/v3/index.json" />
1613
<!-- End: Package sources from dotnet-emsdk -->
1714
<!-- Begin: Package sources from dotnet-wcf -->
1815
<!-- 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.26">
11+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.100" Version="6.0.27">
1212
<Uri>https://github.com/dotnet/emsdk</Uri>
13-
<Sha>5460e2cb3721954528c452d9d32474e4c32b7141</Sha>
13+
<Sha>a9f209f82fadb1f694ae6932f92c32918e407ded</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.300" Version="6.0.26">
15+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.300" Version="6.0.27">
1616
<Uri>https://github.com/dotnet/emsdk</Uri>
17-
<Sha>5460e2cb3721954528c452d9d32474e4c32b7141</Sha>
17+
<Sha>a9f209f82fadb1f694ae6932f92c32918e407ded</Sha>
1818
</Dependency>
19-
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.400" Version="6.0.26">
19+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.400" Version="6.0.27">
2020
<Uri>https://github.com/dotnet/emsdk</Uri>
21-
<Sha>5460e2cb3721954528c452d9d32474e4c32b7141</Sha>
21+
<Sha>a9f209f82fadb1f694ae6932f92c32918e407ded</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.26</MicrosoftNETWorkloadEmscriptenManifest60100Version>
180-
<MicrosoftNETWorkloadEmscriptenManifest60300Version>6.0.26</MicrosoftNETWorkloadEmscriptenManifest60300Version>
181-
<MicrosoftNETWorkloadEmscriptenManifest60400Version>6.0.26</MicrosoftNETWorkloadEmscriptenManifest60400Version>
179+
<MicrosoftNETWorkloadEmscriptenManifest60100Version>6.0.27</MicrosoftNETWorkloadEmscriptenManifest60100Version>
180+
<MicrosoftNETWorkloadEmscriptenManifest60300Version>6.0.27</MicrosoftNETWorkloadEmscriptenManifest60300Version>
181+
<MicrosoftNETWorkloadEmscriptenManifest60400Version>6.0.27</MicrosoftNETWorkloadEmscriptenManifest60400Version>
182182
<MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEmscriptenManifest60100Version)</MicrosoftNETRuntimeEmscriptenVersion>
183183
<!-- workloads -->
184184
<SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion>

0 commit comments

Comments
 (0)