Skip to content

Commit f718f7a

Browse files
AndriySvyrydAndriySvyryd
authored
Merge branch 'release/9.0' => 'release/9.0-staging' (#35750)
2 parents 67f52d8 + c18fc67 commit f718f7a

File tree

5 files changed

+69
-73
lines changed

5 files changed

+69
-73
lines changed

‎NuGet.config

+12-6
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,12 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-runtime -->
7-
<add key="darc-int-dotnet-runtime-c8acea2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-c8acea22/nuget/v3/index.json" />
8-
<add key="darc-int-dotnet-runtime-c8acea2-8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-c8acea22-8/nuget/v3/index.json" />
9-
<add key="darc-int-dotnet-runtime-c8acea2-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-c8acea22-3/nuget/v3/index.json" />
7+
<add key="darc-int-dotnet-runtime-80aa709" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-80aa709f/nuget/v3/index.json" />
8+
<add key="darc-int-dotnet-runtime-80aa709-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-80aa709f-2/nuget/v3/index.json" />
9+
<add key="darc-int-dotnet-runtime-80aa709-15" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-80aa709f-15/nuget/v3/index.json" />
10+
<add key="darc-int-dotnet-runtime-80aa709-14" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-80aa709f-14/nuget/v3/index.json" />
11+
<add key="darc-int-dotnet-runtime-80aa709-12" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-80aa709f-12/nuget/v3/index.json" />
12+
<add key="darc-int-dotnet-runtime-80aa709-10" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-80aa709f-10/nuget/v3/index.json" />
1013
<!-- End: Package sources from dotnet-runtime -->
1114
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1215
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -23,9 +26,12 @@
2326
<clear />
2427
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2528
<!-- Begin: Package sources from dotnet-runtime -->
26-
<add key="darc-int-dotnet-runtime-c8acea2-3" value="true" />
27-
<add key="darc-int-dotnet-runtime-c8acea2-8" value="true" />
28-
<add key="darc-int-dotnet-runtime-c8acea2" value="true" />
29+
<add key="darc-int-dotnet-runtime-80aa709-10" value="true" />
30+
<add key="darc-int-dotnet-runtime-80aa709-12" value="true" />
31+
<add key="darc-int-dotnet-runtime-80aa709-14" value="true" />
32+
<add key="darc-int-dotnet-runtime-80aa709-15" value="true" />
33+
<add key="darc-int-dotnet-runtime-80aa709-2" value="true" />
34+
<add key="darc-int-dotnet-runtime-80aa709" value="true" />
2935
<!-- End: Package sources from dotnet-runtime -->
3036
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3137
</disabledPackageSources>

‎eng/Version.Details.xml

+36-36
Original file line numberDiff line numberDiff line change
@@ -1,83 +1,83 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="9.0.1">
4+
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="9.0.2">
55
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
6-
<Sha>c8acea22626efab11c13778c028975acdc34678f</Sha>
6+
<Sha>80aa709f5d919c6814726788dc6dabe23e79e672</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.1">
8+
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.2">
99
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
10-
<Sha>c8acea22626efab11c13778c028975acdc34678f</Sha>
10+
<Sha>80aa709f5d919c6814726788dc6dabe23e79e672</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.1">
12+
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.2">
1313
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
14-
<Sha>c8acea22626efab11c13778c028975acdc34678f</Sha>
14+
<Sha>80aa709f5d919c6814726788dc6dabe23e79e672</Sha>
1515
</Dependency>
16-
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="9.0.1">
16+
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="9.0.2">
1717
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
18-
<Sha>c8acea22626efab11c13778c028975acdc34678f</Sha>
18+
<Sha>80aa709f5d919c6814726788dc6dabe23e79e672</Sha>
1919
</Dependency>
20-
<Dependency Name="Microsoft.Extensions.Configuration" Version="9.0.1">
20+
<Dependency Name="Microsoft.Extensions.Configuration" Version="9.0.2">
2121
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
22-
<Sha>c8acea22626efab11c13778c028975acdc34678f</Sha>
22+
<Sha>80aa709f5d919c6814726788dc6dabe23e79e672</Sha>
2323
</Dependency>
24-
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="9.0.1">
24+
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="9.0.2">
2525
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
26-
<Sha>c8acea22626efab11c13778c028975acdc34678f</Sha>
26+
<Sha>80aa709f5d919c6814726788dc6dabe23e79e672</Sha>
2727
</Dependency>
28-
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="9.0.1">
28+
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="9.0.2">
2929
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
30-
<Sha>c8acea22626efab11c13778c028975acdc34678f</Sha>
30+
<Sha>80aa709f5d919c6814726788dc6dabe23e79e672</Sha>
3131
</Dependency>
32-
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="9.0.1-servicing.24610.10">
32+
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="9.0.2-servicing.25066.10">
3333
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
34-
<Sha>c8acea22626efab11c13778c028975acdc34678f</Sha>
34+
<Sha>80aa709f5d919c6814726788dc6dabe23e79e672</Sha>
3535
</Dependency>
36-
<Dependency Name="Microsoft.Extensions.Logging" Version="9.0.1">
36+
<Dependency Name="Microsoft.Extensions.Logging" Version="9.0.2">
3737
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
38-
<Sha>c8acea22626efab11c13778c028975acdc34678f</Sha>
38+
<Sha>80aa709f5d919c6814726788dc6dabe23e79e672</Sha>
3939
</Dependency>
40-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.1">
40+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.2">
4141
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
42-
<Sha>c8acea22626efab11c13778c028975acdc34678f</Sha>
42+
<Sha>80aa709f5d919c6814726788dc6dabe23e79e672</Sha>
4343
</Dependency>
44-
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="9.0.1-servicing.24610.10">
44+
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="9.0.2-servicing.25066.10">
4545
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
46-
<Sha>c8acea22626efab11c13778c028975acdc34678f</Sha>
46+
<Sha>80aa709f5d919c6814726788dc6dabe23e79e672</Sha>
4747
</Dependency>
4848
<!--
4949
Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
5050
All Runtime.$rid packages should have the same version.
5151
-->
52-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.1">
52+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.2">
5353
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
54-
<Sha>c8acea22626efab11c13778c028975acdc34678f</Sha>
54+
<Sha>80aa709f5d919c6814726788dc6dabe23e79e672</Sha>
5555
</Dependency>
56-
<Dependency Name="System.Text.Json" Version="9.0.1">
56+
<Dependency Name="System.Text.Json" Version="9.0.2">
5757
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
58-
<Sha>c8acea22626efab11c13778c028975acdc34678f</Sha>
58+
<Sha>80aa709f5d919c6814726788dc6dabe23e79e672</Sha>
5959
</Dependency>
60-
<Dependency Name="System.Text.Encodings.Web" Version="9.0.1">
60+
<Dependency Name="System.Text.Encodings.Web" Version="9.0.2">
6161
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
62-
<Sha>c8acea22626efab11c13778c028975acdc34678f</Sha>
62+
<Sha>80aa709f5d919c6814726788dc6dabe23e79e672</Sha>
6363
</Dependency>
64-
<Dependency Name="System.Formats.Asn1" Version="9.0.1">
64+
<Dependency Name="System.Formats.Asn1" Version="9.0.2">
6565
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
66-
<Sha>c8acea22626efab11c13778c028975acdc34678f</Sha>
66+
<Sha>80aa709f5d919c6814726788dc6dabe23e79e672</Sha>
6767
</Dependency>
6868
</ProductDependencies>
6969
<ToolsetDependencies>
70-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25065.2">
70+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25111.5">
7171
<Uri>https://github.com/dotnet/arcade</Uri>
72-
<Sha>c4bbc67763bf0c5a868862df874079380e647d61</Sha>
72+
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
7373
</Dependency>
74-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.25065.2">
74+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.25111.5">
7575
<Uri>https://github.com/dotnet/arcade</Uri>
76-
<Sha>c4bbc67763bf0c5a868862df874079380e647d61</Sha>
76+
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
7777
</Dependency>
78-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25065.2">
78+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25111.5">
7979
<Uri>https://github.com/dotnet/arcade</Uri>
80-
<Sha>c4bbc67763bf0c5a868862df874079380e647d61</Sha>
80+
<Sha>5da211e1c42254cb35e7ef3d5a8428fb24853169</Sha>
8181
</Dependency>
8282
</ToolsetDependencies>
8383
</Dependencies>

‎eng/Versions.props

+17-17
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup Label="Version settings">
3-
<VersionPrefix>9.0.2</VersionPrefix>
3+
<VersionPrefix>9.0.4</VersionPrefix>
44
<PreReleaseVersionLabel>rtm</PreReleaseVersionLabel>
55
<PreReleaseVersionIteration>
66
</PreReleaseVersionIteration>
@@ -17,24 +17,24 @@
1717
<UsingToolXliff>False</UsingToolXliff>
1818
</PropertyGroup>
1919
<PropertyGroup Label="Dependencies from dotnet/runtime">
20-
<MicrosoftExtensionsCachingMemoryVersion>9.0.1</MicrosoftExtensionsCachingMemoryVersion>
21-
<MicrosoftExtensionsConfigurationVersion>9.0.1</MicrosoftExtensionsConfigurationVersion>
22-
<MicrosoftExtensionsConfigurationAbstractionsVersion>9.0.1</MicrosoftExtensionsConfigurationAbstractionsVersion>
23-
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>9.0.1</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
24-
<MicrosoftExtensionsConfigurationJsonVersion>9.0.1</MicrosoftExtensionsConfigurationJsonVersion>
25-
<MicrosoftExtensionsDependencyInjectionVersion>9.0.1</MicrosoftExtensionsDependencyInjectionVersion>
26-
<MicrosoftExtensionsDependencyModelVersion>9.0.1</MicrosoftExtensionsDependencyModelVersion>
27-
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>9.0.1-servicing.24610.10</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
28-
<MicrosoftExtensionsLoggingVersion>9.0.1</MicrosoftExtensionsLoggingVersion>
29-
<MicrosoftNETCoreAppRefVersion>9.0.1</MicrosoftNETCoreAppRefVersion>
30-
<MicrosoftNETCoreAppRuntimewinx64Version>9.0.1</MicrosoftNETCoreAppRuntimewinx64Version>
31-
<MicrosoftNETCoreBrowserDebugHostTransportVersion>9.0.1-servicing.24610.10</MicrosoftNETCoreBrowserDebugHostTransportVersion>
32-
<SystemTextEncodingsWebVersion>9.0.1</SystemTextEncodingsWebVersion>
33-
<SystemTextJsonVersion>9.0.1</SystemTextJsonVersion>
34-
<SystemFormatsAsn1Version>9.0.1</SystemFormatsAsn1Version>
20+
<MicrosoftExtensionsCachingMemoryVersion>9.0.2</MicrosoftExtensionsCachingMemoryVersion>
21+
<MicrosoftExtensionsConfigurationVersion>9.0.2</MicrosoftExtensionsConfigurationVersion>
22+
<MicrosoftExtensionsConfigurationAbstractionsVersion>9.0.2</MicrosoftExtensionsConfigurationAbstractionsVersion>
23+
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>9.0.2</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
24+
<MicrosoftExtensionsConfigurationJsonVersion>9.0.2</MicrosoftExtensionsConfigurationJsonVersion>
25+
<MicrosoftExtensionsDependencyInjectionVersion>9.0.2</MicrosoftExtensionsDependencyInjectionVersion>
26+
<MicrosoftExtensionsDependencyModelVersion>9.0.2</MicrosoftExtensionsDependencyModelVersion>
27+
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>9.0.2-servicing.25066.10</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
28+
<MicrosoftExtensionsLoggingVersion>9.0.2</MicrosoftExtensionsLoggingVersion>
29+
<MicrosoftNETCoreAppRefVersion>9.0.2</MicrosoftNETCoreAppRefVersion>
30+
<MicrosoftNETCoreAppRuntimewinx64Version>9.0.2</MicrosoftNETCoreAppRuntimewinx64Version>
31+
<MicrosoftNETCoreBrowserDebugHostTransportVersion>9.0.2-servicing.25066.10</MicrosoftNETCoreBrowserDebugHostTransportVersion>
32+
<SystemTextEncodingsWebVersion>9.0.2</SystemTextEncodingsWebVersion>
33+
<SystemTextJsonVersion>9.0.2</SystemTextJsonVersion>
34+
<SystemFormatsAsn1Version>9.0.2</SystemFormatsAsn1Version>
3535
</PropertyGroup>
3636
<PropertyGroup Label="Dependencies from dotnet/arcade">
37-
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.25065.2</MicrosoftDotNetBuildTasksTemplatingVersion>
37+
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.25111.5</MicrosoftDotNetBuildTasksTemplatingVersion>
3838
</PropertyGroup>
3939
<PropertyGroup Label="Other dependencies">
4040
<MicrosoftBuildFrameworkVersion>17.8.3</MicrosoftBuildFrameworkVersion>

‎eng/common/internal/Tools.csproj

-10
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,6 @@
1515
<PackageReference Include="Microsoft.DotNet.IBCMerge" Version="$(MicrosoftDotNetIBCMergeVersion)" Condition="'$(UsingToolIbcOptimization)' == 'true'" />
1616
<PackageReference Include="Drop.App" Version="$(DropAppVersion)" ExcludeAssets="all" Condition="'$(UsingToolVisualStudioIbcTraining)' == 'true'"/>
1717
</ItemGroup>
18-
<PropertyGroup>
19-
<RestoreSources></RestoreSources>
20-
<RestoreSources Condition="'$(UsingToolIbcOptimization)' == 'true'">
21-
https://devdiv.pkgs.visualstudio.com/_packaging/dotnet-core-internal-tooling/nuget/v3/index.json;
22-
</RestoreSources>
23-
<RestoreSources Condition="'$(UsingToolVisualStudioIbcTraining)' == 'true'">
24-
$(RestoreSources);
25-
https://devdiv.pkgs.visualstudio.com/_packaging/VS/nuget/v3/index.json;
26-
</RestoreSources>
27-
</PropertyGroup>
2818

2919
<!-- Repository extensibility point -->
3020
<Import Project="$(RepositoryEngineeringDir)InternalTools.props" Condition="Exists('$(RepositoryEngineeringDir)InternalTools.props')" />

‎global.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
22
"sdk": {
3-
"version": "9.0.102",
3+
"version": "9.0.103",
44
"allowPrerelease": true,
55
"rollForward": "latestMajor"
66
},
77
"tools": {
8-
"dotnet": "9.0.102",
8+
"dotnet": "9.0.103",
99
"runtimes": {
1010
"dotnet": [
1111
"$(MicrosoftNETCoreBrowserDebugHostTransportVersion)"
1212
]
1313
}
1414
},
1515
"msbuild-sdks": {
16-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25065.2",
17-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25065.2"
16+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25111.5",
17+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25111.5"
1818
}
1919
}

0 commit comments

Comments
 (0)