Skip to content

Commit 4c7e8b1

Browse files
authored
Merge pull request #111421 from dotnet/merge/release/8.0-to-release/8.0-staging
[automated] Merge branch 'release/8.0' => 'release/8.0-staging'
2 parents 43c0824 + 50773e8 commit 4c7e8b1

File tree

3 files changed

+7
-10
lines changed

3 files changed

+7
-10
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-c458a76" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c458a764/nuget/v3/index.json" />
13-
<add key="darc-pub-dotnet-emsdk-c458a76-3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c458a764-3/nuget/v3/index.json" />
14-
<add key="darc-pub-dotnet-emsdk-c458a76-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c458a764-2/nuget/v3/index.json" />
15-
<add key="darc-pub-dotnet-emsdk-c458a76-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c458a764-1/nuget/v3/index.json" />
12+
<add key="darc-pub-dotnet-emsdk-b767aab" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-b767aaba/nuget/v3/index.json" />
1613
<!-- End: Package sources from dotnet-emsdk -->
1714
<!-- Begin: Package sources from dotnet-sdk -->
1815
<!-- End: Package sources from dotnet-sdk -->

eng/Version.Details.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,13 @@
9090
<Sha>45dd3a73dd5b64b010c4251303b3664bb30df029</Sha>
9191
<SourceBuild RepoName="cecil" ManagedOnly="true" />
9292
</Dependency>
93-
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100" Version="8.0.12">
93+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100" Version="8.0.13">
9494
<Uri>https://github.com/dotnet/emsdk</Uri>
95-
<Sha>c458a7647c04e323c238f381eb176af24254b3ff</Sha>
95+
<Sha>b767aaba495c5666e715d070cf2556e6a6bb58dc</Sha>
9696
</Dependency>
97-
<Dependency Name="Microsoft.SourceBuild.Intermediate.emsdk" Version="8.0.12-servicing.24569.2">
97+
<Dependency Name="Microsoft.SourceBuild.Intermediate.emsdk" Version="8.0.13-servicing.25071.1">
9898
<Uri>https://github.com/dotnet/emsdk</Uri>
99-
<Sha>c458a7647c04e323c238f381eb176af24254b3ff</Sha>
99+
<Sha>b767aaba495c5666e715d070cf2556e6a6bb58dc</Sha>
100100
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
101101
</Dependency>
102102
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="8.0.0-alpha.1.25060.2">

eng/Versions.props

+2-2
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@
167167
<optimizationlinuxarm64MIBCRuntimeVersion>1.0.0-prerelease.23566.3</optimizationlinuxarm64MIBCRuntimeVersion>
168168
<optimizationPGOCoreCLRVersion>1.0.0-prerelease.23566.3</optimizationPGOCoreCLRVersion>
169169
<!-- Not auto-updated. -->
170-
<MicrosoftDiaSymReaderNativeVersion>17.10.0-beta1.24272.1</MicrosoftDiaSymReaderNativeVersion>
170+
<MicrosoftDiaSymReaderNativeVersion>17.12.0-beta1.24603.5</MicrosoftDiaSymReaderNativeVersion>
171171
<SystemCommandLineVersion>2.0.0-beta4.23307.1</SystemCommandLineVersion>
172172
<TraceEventVersion>3.0.3</TraceEventVersion>
173173
<NETStandardLibraryRefVersion>2.1.0</NETStandardLibraryRefVersion>
@@ -242,7 +242,7 @@
242242
Note: when the name is updated, make sure to update dependency name in eng/pipelines/common/xplat-setup.yml
243243
like - DarcDependenciesChanged.Microsoft_NET_Workload_Emscripten_Current_Manifest-8_0_100_Transport
244244
-->
245-
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version>8.0.12</MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version>
245+
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version>8.0.13</MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version>
246246
<MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version)</MicrosoftNETRuntimeEmscriptenVersion>
247247
<!-- workloads -->
248248
<SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion>

0 commit comments

Comments
 (0)