Skip to content

Commit f53f226

Browse files
authored
Merge pull request #115410 from dotnet/merge/release/8.0-to-release/8.0-staging
[automated] Merge branch 'release/8.0' => 'release/8.0-staging'
2 parents 2c39632 + ea5fb7f commit f53f226

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
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-adc0d6e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-adc0d6e7/nuget/v3/index.json" />
12+
<add key="darc-pub-dotnet-emsdk-2b0cca8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-2b0cca8a/nuget/v3/index.json" />
1313
<!-- End: Package sources from dotnet-emsdk -->
1414
<!-- Begin: Package sources from dotnet-sdk -->
1515
<!-- End: Package sources from dotnet-sdk -->

eng/Version.Details.xml

Lines changed: 4 additions & 4 deletions
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.16">
93+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100" Version="8.0.17">
9494
<Uri>https://github.com/dotnet/emsdk</Uri>
95-
<Sha>adc0d6e7d3abb9c4ecee2420c51ae99c57dc9755</Sha>
95+
<Sha>2b0cca8ad3a88e02fe0878139009ffffde071f1f</Sha>
9696
</Dependency>
97-
<Dependency Name="Microsoft.SourceBuild.Intermediate.emsdk" Version="8.0.16-servicing.25211.4">
97+
<Dependency Name="Microsoft.SourceBuild.Intermediate.emsdk" Version="8.0.17-servicing.25258.1">
9898
<Uri>https://github.com/dotnet/emsdk</Uri>
99-
<Sha>adc0d6e7d3abb9c4ecee2420c51ae99c57dc9755</Sha>
99+
<Sha>2b0cca8ad3a88e02fe0878139009ffffde071f1f</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.25081.5">

eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project>
22
<PropertyGroup>
33
<!-- The .NET product branding version -->
4-
<ProductVersion>8.0.16</ProductVersion>
4+
<ProductVersion>8.0.17</ProductVersion>
55
<!-- File version numbers -->
66
<MajorVersion>8</MajorVersion>
77
<MinorVersion>0</MinorVersion>
8-
<PatchVersion>16</PatchVersion>
8+
<PatchVersion>17</PatchVersion>
99
<SdkBandVersion>8.0.100</SdkBandVersion>
1010
<PackageVersionNet7>7.0.20</PackageVersionNet7>
1111
<PackageVersionNet6>6.0.36</PackageVersionNet6>
@@ -252,7 +252,7 @@
252252
Note: when the name is updated, make sure to update dependency name in eng/pipelines/common/xplat-setup.yml
253253
like - DarcDependenciesChanged.Microsoft_NET_Workload_Emscripten_Current_Manifest-8_0_100_Transport
254254
-->
255-
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version>8.0.16</MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version>
255+
<MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version>8.0.17</MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version>
256256
<MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version)</MicrosoftNETRuntimeEmscriptenVersion>
257257
<!-- workloads -->
258258
<SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion>

0 commit comments

Comments
 (0)