Skip to content

Commit e9a0a84

Browse files
authored
Merge pull request #114224 from dotnet/merge/release/9.0-to-release/9.0-staging
[automated] Merge branch 'release/9.0' => 'release/9.0-staging'
2 parents a9c314d + 104c1fa commit e9a0a84

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

NuGet.config

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@
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-3df5eac" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-3df5eac9/nuget/v3/index.json" />
1213
<add key="darc-pub-dotnet-emsdk-b8d8fec" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-b8d8fec8/nuget/v3/index.json" />
1314
<add key="darc-pub-dotnet-emsdk-78be8cd" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-78be8cdf/nuget/v3/index.json" />
14-
<add key="darc-pub-dotnet-emsdk-78be8cd-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-78be8cdf-2/nuget/v3/index.json" />
1515
<add key="darc-pub-dotnet-emsdk-78be8cd-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-78be8cdf-1/nuget/v3/index.json" />
16+
<add key="darc-pub-dotnet-emsdk-78be8cd-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-78be8cdf-2/nuget/v3/index.json" />
1617
<!-- End: Package sources from dotnet-emsdk -->
1718
<!-- Begin: Package sources from dotnet-sdk -->
1819
<add key="darc-pub-dotnet-sdk-8d515d2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-sdk-8d515d2a/nuget/v3/index.json" />

eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,18 +64,18 @@
6464
<Sha>e9c26dfe3cdc9cafe5acd2bb9aa1fa1b4cbcc72f</Sha>
6565
<SourceBuild RepoName="cecil" ManagedOnly="true" />
6666
</Dependency>
67-
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.4-servicing.25177.1">
67+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.5-servicing.25203.2">
6868
<Uri>https://github.com/dotnet/emsdk</Uri>
69-
<Sha>b8d8fec81291264a825ba4c803ad50577b9d2265</Sha>
69+
<Sha>3df5eac9e2dfcf5ff544c1a83f2a07ce9270b2f6</Sha>
7070
</Dependency>
71-
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100" Version="9.0.4">
71+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100" Version="9.0.5">
7272
<Uri>https://github.com/dotnet/emsdk</Uri>
73-
<Sha>b8d8fec81291264a825ba4c803ad50577b9d2265</Sha>
73+
<Sha>3df5eac9e2dfcf5ff544c1a83f2a07ce9270b2f6</Sha>
7474
</Dependency>
7575
<!-- Intermediate is necessary for source build. -->
76-
<Dependency Name="Microsoft.SourceBuild.Intermediate.emsdk" Version="9.0.4-servicing.25177.1">
76+
<Dependency Name="Microsoft.SourceBuild.Intermediate.emsdk" Version="9.0.5-servicing.25203.2">
7777
<Uri>https://github.com/dotnet/emsdk</Uri>
78-
<Sha>b8d8fec81291264a825ba4c803ad50577b9d2265</Sha>
78+
<Sha>3df5eac9e2dfcf5ff544c1a83f2a07ce9270b2f6</Sha>
7979
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
8080
</Dependency>
8181
<!-- Intermediate is necessary for source build. -->

eng/Versions.props

Lines changed: 4 additions & 4 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>9.0.4</ProductVersion>
4+
<ProductVersion>9.0.5</ProductVersion>
55
<!-- File version numbers -->
66
<MajorVersion>9</MajorVersion>
77
<MinorVersion>0</MinorVersion>
8-
<PatchVersion>4</PatchVersion>
8+
<PatchVersion>5</PatchVersion>
99
<SdkBandVersion>9.0.100</SdkBandVersion>
1010
<PackageVersionNet8>8.0.$([MSBuild]::Add($(PatchVersion),11))</PackageVersionNet8>
1111
<PackageVersionNet7>7.0.20</PackageVersionNet7>
@@ -243,8 +243,8 @@
243243
Note: when the name is updated, make sure to update dependency name in eng/pipelines/common/xplat-setup.yml
244244
like - DarcDependenciesChanged.Microsoft_NET_Workload_Emscripten_Current_Manifest-9_0_100_Transport
245245
-->
246-
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>9.0.4-servicing.25177.1</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>
247-
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100Version>9.0.4</MicrosoftNETWorkloadEmscriptenCurrentManifest90100Version>
246+
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>9.0.5-servicing.25203.2</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>
247+
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100Version>9.0.5</MicrosoftNETWorkloadEmscriptenCurrentManifest90100Version>
248248
<MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest90100Version)</MicrosoftNETRuntimeEmscriptenVersion>
249249
<!-- workloads -->
250250
<SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion>

0 commit comments

Comments
 (0)