Skip to content

Commit 189fbbd

Browse files
committed
Merge in 'release/6.0' changes
2 parents c95b683 + 8eca07b commit 189fbbd

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

NuGet.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +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-bc697dd" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-bc697dd8/nuget/v3/index.json" />
12+
<add key="darc-pub-dotnet-emsdk-5a6205a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-5a6205aa/nuget/v3/index.json" />
1313
<!-- End: Package sources from dotnet-emsdk -->
1414
<!-- Begin: Package sources from dotnet-wcf -->
1515
<!-- End: Package sources from dotnet-wcf -->

eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
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.28">
11+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.100" Version="6.0.29">
1212
<Uri>https://github.com/dotnet/emsdk</Uri>
13-
<Sha>bc697dd84500aeee0bcb6323e64967222f90c2aa</Sha>
13+
<Sha>5a6205aabc468d65922f79266532e0eea9ca97ec</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.300" Version="6.0.28">
15+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.300" Version="6.0.29">
1616
<Uri>https://github.com/dotnet/emsdk</Uri>
17-
<Sha>bc697dd84500aeee0bcb6323e64967222f90c2aa</Sha>
17+
<Sha>5a6205aabc468d65922f79266532e0eea9ca97ec</Sha>
1818
</Dependency>
19-
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.400" Version="6.0.28">
19+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-6.0.400" Version="6.0.29">
2020
<Uri>https://github.com/dotnet/emsdk</Uri>
21-
<Sha>bc697dd84500aeee0bcb6323e64967222f90c2aa</Sha>
21+
<Sha>5a6205aabc468d65922f79266532e0eea9ca97ec</Sha>
2222
</Dependency>
2323
<Dependency Name="System.ServiceModel.Primitives" Version="4.9.0">
2424
<Uri>https://github.com/dotnet/wcf</Uri>

eng/Versions.props

Lines changed: 3 additions & 3 deletions
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.28</MicrosoftNETWorkloadEmscriptenManifest60100Version>
180-
<MicrosoftNETWorkloadEmscriptenManifest60300Version>6.0.28</MicrosoftNETWorkloadEmscriptenManifest60300Version>
181-
<MicrosoftNETWorkloadEmscriptenManifest60400Version>6.0.28</MicrosoftNETWorkloadEmscriptenManifest60400Version>
179+
<MicrosoftNETWorkloadEmscriptenManifest60100Version>6.0.29</MicrosoftNETWorkloadEmscriptenManifest60100Version>
180+
<MicrosoftNETWorkloadEmscriptenManifest60300Version>6.0.29</MicrosoftNETWorkloadEmscriptenManifest60300Version>
181+
<MicrosoftNETWorkloadEmscriptenManifest60400Version>6.0.29</MicrosoftNETWorkloadEmscriptenManifest60400Version>
182182
<MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEmscriptenManifest60100Version)</MicrosoftNETRuntimeEmscriptenVersion>
183183
<!-- workloads -->
184184
<SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion>

0 commit comments

Comments
 (0)