Skip to content

Commit f5a9459

Browse files
authored
Merge pull request #112219 from dotnet/merge/release/9.0-to-release/9.0-staging
[automated] Merge branch 'release/9.0' => 'release/9.0-staging'
2 parents d042fc3 + ca6fe3d commit f5a9459

File tree

3 files changed

+12
-10
lines changed

3 files changed

+12
-10
lines changed

NuGet.config

+2
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
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-dad5528" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-dad5528e/nuget/v3/index.json" />
13+
<add key="darc-pub-dotnet-emsdk-79f708d" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-79f708d7/nuget/v3/index.json" />
1214
<add key="darc-pub-dotnet-emsdk-2c27e40-15" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-2c27e405-15/nuget/v3/index.json" />
1315
<add key="darc-pub-dotnet-emsdk-2c27e40-14" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-2c27e405-14/nuget/v3/index.json" />
1416
<add key="darc-pub-dotnet-emsdk-2c27e40-13" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-2c27e405-13/nuget/v3/index.json" />

eng/Version.Details.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -64,18 +64,18 @@
6464
<Sha>aa3ae0d49da3cfb31a383f16303a3f2f0c3f1a19</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.2-servicing.25061.2">
67+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.3-servicing.25105.2">
6868
<Uri>https://github.com/dotnet/emsdk</Uri>
69-
<Sha>2c27e405e17595694d91892159593d6dd10e61e2</Sha>
69+
<Sha>dad5528e5bdf92a05a5a404c5f7939523390b96d</Sha>
7070
</Dependency>
71-
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100" Version="9.0.2">
71+
<Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100" Version="9.0.3">
7272
<Uri>https://github.com/dotnet/emsdk</Uri>
73-
<Sha>2c27e405e17595694d91892159593d6dd10e61e2</Sha>
73+
<Sha>dad5528e5bdf92a05a5a404c5f7939523390b96d</Sha>
7474
</Dependency>
7575
<!-- Intermediate is necessary for source build. -->
76-
<Dependency Name="Microsoft.SourceBuild.Intermediate.emsdk" Version="9.0.2-servicing.25061.2">
76+
<Dependency Name="Microsoft.SourceBuild.Intermediate.emsdk" Version="9.0.3-servicing.25105.2">
7777
<Uri>https://github.com/dotnet/emsdk</Uri>
78-
<Sha>2c27e405e17595694d91892159593d6dd10e61e2</Sha>
78+
<Sha>dad5528e5bdf92a05a5a404c5f7939523390b96d</Sha>
7979
<SourceBuild RepoName="emsdk" ManagedOnly="true" />
8080
</Dependency>
8181
<!-- Intermediate is necessary for source build. -->

eng/Versions.props

+4-4
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.2</ProductVersion>
4+
<ProductVersion>9.0.3</ProductVersion>
55
<!-- File version numbers -->
66
<MajorVersion>9</MajorVersion>
77
<MinorVersion>0</MinorVersion>
8-
<PatchVersion>2</PatchVersion>
8+
<PatchVersion>3</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.2-servicing.25061.2</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>
247-
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100Version>9.0.2</MicrosoftNETWorkloadEmscriptenCurrentManifest90100Version>
246+
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>9.0.3-servicing.25105.2</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>
247+
<MicrosoftNETWorkloadEmscriptenCurrentManifest90100Version>9.0.3</MicrosoftNETWorkloadEmscriptenCurrentManifest90100Version>
248248
<MicrosoftNETRuntimeEmscriptenVersion>$(MicrosoftNETWorkloadEmscriptenCurrentManifest90100Version)</MicrosoftNETRuntimeEmscriptenVersion>
249249
<!-- workloads -->
250250
<SwixPackageVersion>1.1.87-gba258badda</SwixPackageVersion>

0 commit comments

Comments
 (0)