Skip to content

Commit 314458d

Browse files
authored
Merging internal commits for release/9.0 (#35925)
2 parents 19b2edd + 55254c1 commit 314458d

File tree

3 files changed

+47
-45
lines changed

3 files changed

+47
-45
lines changed

Diff for: NuGet.config

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
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-f57e6dc" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-f57e6dc7/nuget/v3/index.json" />
78
<!-- End: Package sources from dotnet-runtime -->
89
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
910
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -20,6 +21,7 @@
2021
<clear />
2122
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2223
<!-- Begin: Package sources from dotnet-runtime -->
24+
<add key="darc-int-dotnet-runtime-f57e6dc" value="true" />
2325
<!-- End: Package sources from dotnet-runtime -->
2426
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2527
</disabledPackageSources>

Diff for: eng/Version.Details.xml

+30-30
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,69 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="9.0.3">
4+
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="9.0.4">
55
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
6-
<Sha>831d23e56149cd59c40fc00c7feb7c5334bd19c4</Sha>
6+
<Sha>f57e6dc747158ab7ade4e62a75a6750d16b771e8</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.3">
8+
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.4">
99
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
10-
<Sha>831d23e56149cd59c40fc00c7feb7c5334bd19c4</Sha>
10+
<Sha>f57e6dc747158ab7ade4e62a75a6750d16b771e8</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.3">
12+
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.4">
1313
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
14-
<Sha>831d23e56149cd59c40fc00c7feb7c5334bd19c4</Sha>
14+
<Sha>f57e6dc747158ab7ade4e62a75a6750d16b771e8</Sha>
1515
</Dependency>
16-
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="9.0.3">
16+
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="9.0.4">
1717
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
18-
<Sha>831d23e56149cd59c40fc00c7feb7c5334bd19c4</Sha>
18+
<Sha>f57e6dc747158ab7ade4e62a75a6750d16b771e8</Sha>
1919
</Dependency>
20-
<Dependency Name="Microsoft.Extensions.Configuration" Version="9.0.3">
20+
<Dependency Name="Microsoft.Extensions.Configuration" Version="9.0.4">
2121
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
22-
<Sha>831d23e56149cd59c40fc00c7feb7c5334bd19c4</Sha>
22+
<Sha>f57e6dc747158ab7ade4e62a75a6750d16b771e8</Sha>
2323
</Dependency>
24-
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="9.0.3">
24+
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="9.0.4">
2525
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
26-
<Sha>831d23e56149cd59c40fc00c7feb7c5334bd19c4</Sha>
26+
<Sha>f57e6dc747158ab7ade4e62a75a6750d16b771e8</Sha>
2727
</Dependency>
28-
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="9.0.3">
28+
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="9.0.4">
2929
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
30-
<Sha>831d23e56149cd59c40fc00c7feb7c5334bd19c4</Sha>
30+
<Sha>f57e6dc747158ab7ade4e62a75a6750d16b771e8</Sha>
3131
</Dependency>
32-
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="9.0.3-servicing.25111.13">
32+
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="9.0.4-servicing.25163.5">
3333
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
34-
<Sha>831d23e56149cd59c40fc00c7feb7c5334bd19c4</Sha>
34+
<Sha>f57e6dc747158ab7ade4e62a75a6750d16b771e8</Sha>
3535
</Dependency>
36-
<Dependency Name="Microsoft.Extensions.Logging" Version="9.0.3">
36+
<Dependency Name="Microsoft.Extensions.Logging" Version="9.0.4">
3737
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
38-
<Sha>831d23e56149cd59c40fc00c7feb7c5334bd19c4</Sha>
38+
<Sha>f57e6dc747158ab7ade4e62a75a6750d16b771e8</Sha>
3939
</Dependency>
40-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.3">
40+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.4">
4141
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
42-
<Sha>831d23e56149cd59c40fc00c7feb7c5334bd19c4</Sha>
42+
<Sha>f57e6dc747158ab7ade4e62a75a6750d16b771e8</Sha>
4343
</Dependency>
44-
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="9.0.3-servicing.25111.13">
44+
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="9.0.4-servicing.25163.5">
4545
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
46-
<Sha>831d23e56149cd59c40fc00c7feb7c5334bd19c4</Sha>
46+
<Sha>f57e6dc747158ab7ade4e62a75a6750d16b771e8</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.3">
52+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.4">
5353
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
54-
<Sha>831d23e56149cd59c40fc00c7feb7c5334bd19c4</Sha>
54+
<Sha>f57e6dc747158ab7ade4e62a75a6750d16b771e8</Sha>
5555
</Dependency>
56-
<Dependency Name="System.Text.Json" Version="9.0.3">
56+
<Dependency Name="System.Text.Json" Version="9.0.4">
5757
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
58-
<Sha>831d23e56149cd59c40fc00c7feb7c5334bd19c4</Sha>
58+
<Sha>f57e6dc747158ab7ade4e62a75a6750d16b771e8</Sha>
5959
</Dependency>
60-
<Dependency Name="System.Text.Encodings.Web" Version="9.0.3">
60+
<Dependency Name="System.Text.Encodings.Web" Version="9.0.4">
6161
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
62-
<Sha>831d23e56149cd59c40fc00c7feb7c5334bd19c4</Sha>
62+
<Sha>f57e6dc747158ab7ade4e62a75a6750d16b771e8</Sha>
6363
</Dependency>
64-
<Dependency Name="System.Formats.Asn1" Version="9.0.3">
64+
<Dependency Name="System.Formats.Asn1" Version="9.0.4">
6565
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
66-
<Sha>831d23e56149cd59c40fc00c7feb7c5334bd19c4</Sha>
66+
<Sha>f57e6dc747158ab7ade4e62a75a6750d16b771e8</Sha>
6767
</Dependency>
6868
</ProductDependencies>
6969
<ToolsetDependencies>

Diff for: eng/Versions.props

+15-15
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,21 @@
1717
<UsingToolXliff>False</UsingToolXliff>
1818
</PropertyGroup>
1919
<PropertyGroup Label="Dependencies from dotnet/runtime">
20-
<MicrosoftExtensionsCachingMemoryVersion>9.0.3</MicrosoftExtensionsCachingMemoryVersion>
21-
<MicrosoftExtensionsConfigurationVersion>9.0.3</MicrosoftExtensionsConfigurationVersion>
22-
<MicrosoftExtensionsConfigurationAbstractionsVersion>9.0.3</MicrosoftExtensionsConfigurationAbstractionsVersion>
23-
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>9.0.3</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
24-
<MicrosoftExtensionsConfigurationJsonVersion>9.0.3</MicrosoftExtensionsConfigurationJsonVersion>
25-
<MicrosoftExtensionsDependencyInjectionVersion>9.0.3</MicrosoftExtensionsDependencyInjectionVersion>
26-
<MicrosoftExtensionsDependencyModelVersion>9.0.3</MicrosoftExtensionsDependencyModelVersion>
27-
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>9.0.3-servicing.25111.13</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
28-
<MicrosoftExtensionsLoggingVersion>9.0.3</MicrosoftExtensionsLoggingVersion>
29-
<MicrosoftNETCoreAppRefVersion>9.0.3</MicrosoftNETCoreAppRefVersion>
30-
<MicrosoftNETCoreAppRuntimewinx64Version>9.0.3</MicrosoftNETCoreAppRuntimewinx64Version>
31-
<MicrosoftNETCoreBrowserDebugHostTransportVersion>9.0.3-servicing.25111.13</MicrosoftNETCoreBrowserDebugHostTransportVersion>
32-
<SystemTextEncodingsWebVersion>9.0.3</SystemTextEncodingsWebVersion>
33-
<SystemTextJsonVersion>9.0.3</SystemTextJsonVersion>
34-
<SystemFormatsAsn1Version>9.0.3</SystemFormatsAsn1Version>
20+
<MicrosoftExtensionsCachingMemoryVersion>9.0.4</MicrosoftExtensionsCachingMemoryVersion>
21+
<MicrosoftExtensionsConfigurationVersion>9.0.4</MicrosoftExtensionsConfigurationVersion>
22+
<MicrosoftExtensionsConfigurationAbstractionsVersion>9.0.4</MicrosoftExtensionsConfigurationAbstractionsVersion>
23+
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>9.0.4</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
24+
<MicrosoftExtensionsConfigurationJsonVersion>9.0.4</MicrosoftExtensionsConfigurationJsonVersion>
25+
<MicrosoftExtensionsDependencyInjectionVersion>9.0.4</MicrosoftExtensionsDependencyInjectionVersion>
26+
<MicrosoftExtensionsDependencyModelVersion>9.0.4</MicrosoftExtensionsDependencyModelVersion>
27+
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>9.0.4-servicing.25163.5</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
28+
<MicrosoftExtensionsLoggingVersion>9.0.4</MicrosoftExtensionsLoggingVersion>
29+
<MicrosoftNETCoreAppRefVersion>9.0.4</MicrosoftNETCoreAppRefVersion>
30+
<MicrosoftNETCoreAppRuntimewinx64Version>9.0.4</MicrosoftNETCoreAppRuntimewinx64Version>
31+
<MicrosoftNETCoreBrowserDebugHostTransportVersion>9.0.4-servicing.25163.5</MicrosoftNETCoreBrowserDebugHostTransportVersion>
32+
<SystemTextEncodingsWebVersion>9.0.4</SystemTextEncodingsWebVersion>
33+
<SystemTextJsonVersion>9.0.4</SystemTextJsonVersion>
34+
<SystemFormatsAsn1Version>9.0.4</SystemFormatsAsn1Version>
3535
</PropertyGroup>
3636
<PropertyGroup Label="Dependencies from dotnet/arcade">
3737
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.25208.6</MicrosoftDotNetBuildTasksTemplatingVersion>

0 commit comments

Comments
 (0)