Skip to content

Commit

Permalink
Merge pull request #35622 from vseanreesermsft/internal-merge-9.0-202…
Browse files Browse the repository at this point in the history
…5-02-11-1236

Merging internal commits for release/9.0
  • Loading branch information
maumar authored Feb 11, 2025
2 parents f567bec + f3c6eb1 commit 54f9471
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 51 deletions.
8 changes: 2 additions & 6 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,7 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-runtime -->
<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" />
<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" />
<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" />
<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" />
<!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
Expand All @@ -23,9 +21,7 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-c8acea2-3" value="true" />
<add key="darc-int-dotnet-runtime-c8acea2-8" value="true" />
<add key="darc-int-dotnet-runtime-c8acea2" value="true" />
<add key="darc-int-dotnet-runtime-80aa709" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
</disabledPackageSources>
Expand Down
60 changes: 30 additions & 30 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,69 +1,69 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="9.0.1">
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="9.0.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>c8acea22626efab11c13778c028975acdc34678f</Sha>
<Sha>80aa709f5d919c6814726788dc6dabe23e79e672</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.1">
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>c8acea22626efab11c13778c028975acdc34678f</Sha>
<Sha>80aa709f5d919c6814726788dc6dabe23e79e672</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.1">
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>c8acea22626efab11c13778c028975acdc34678f</Sha>
<Sha>80aa709f5d919c6814726788dc6dabe23e79e672</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="9.0.1">
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="9.0.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>c8acea22626efab11c13778c028975acdc34678f</Sha>
<Sha>80aa709f5d919c6814726788dc6dabe23e79e672</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration" Version="9.0.1">
<Dependency Name="Microsoft.Extensions.Configuration" Version="9.0.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>c8acea22626efab11c13778c028975acdc34678f</Sha>
<Sha>80aa709f5d919c6814726788dc6dabe23e79e672</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="9.0.1">
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="9.0.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>c8acea22626efab11c13778c028975acdc34678f</Sha>
<Sha>80aa709f5d919c6814726788dc6dabe23e79e672</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="9.0.1">
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="9.0.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>c8acea22626efab11c13778c028975acdc34678f</Sha>
<Sha>80aa709f5d919c6814726788dc6dabe23e79e672</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="9.0.1-servicing.24610.10">
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="9.0.2-servicing.25066.10">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>c8acea22626efab11c13778c028975acdc34678f</Sha>
<Sha>80aa709f5d919c6814726788dc6dabe23e79e672</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging" Version="9.0.1">
<Dependency Name="Microsoft.Extensions.Logging" Version="9.0.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>c8acea22626efab11c13778c028975acdc34678f</Sha>
<Sha>80aa709f5d919c6814726788dc6dabe23e79e672</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.1">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>c8acea22626efab11c13778c028975acdc34678f</Sha>
<Sha>80aa709f5d919c6814726788dc6dabe23e79e672</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="9.0.1-servicing.24610.10">
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="9.0.2-servicing.25066.10">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>c8acea22626efab11c13778c028975acdc34678f</Sha>
<Sha>80aa709f5d919c6814726788dc6dabe23e79e672</Sha>
</Dependency>
<!--
Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
All Runtime.$rid packages should have the same version.
-->
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.1">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>c8acea22626efab11c13778c028975acdc34678f</Sha>
<Sha>80aa709f5d919c6814726788dc6dabe23e79e672</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="9.0.1">
<Dependency Name="System.Text.Json" Version="9.0.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>c8acea22626efab11c13778c028975acdc34678f</Sha>
<Sha>80aa709f5d919c6814726788dc6dabe23e79e672</Sha>
</Dependency>
<Dependency Name="System.Text.Encodings.Web" Version="9.0.1">
<Dependency Name="System.Text.Encodings.Web" Version="9.0.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>c8acea22626efab11c13778c028975acdc34678f</Sha>
<Sha>80aa709f5d919c6814726788dc6dabe23e79e672</Sha>
</Dependency>
<Dependency Name="System.Formats.Asn1" Version="9.0.1">
<Dependency Name="System.Formats.Asn1" Version="9.0.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>c8acea22626efab11c13778c028975acdc34678f</Sha>
<Sha>80aa709f5d919c6814726788dc6dabe23e79e672</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
30 changes: 15 additions & 15 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -17,21 +17,21 @@
<UsingToolXliff>False</UsingToolXliff>
</PropertyGroup>
<PropertyGroup Label="Dependencies from dotnet/runtime">
<MicrosoftExtensionsCachingMemoryVersion>9.0.1</MicrosoftExtensionsCachingMemoryVersion>
<MicrosoftExtensionsConfigurationVersion>9.0.1</MicrosoftExtensionsConfigurationVersion>
<MicrosoftExtensionsConfigurationAbstractionsVersion>9.0.1</MicrosoftExtensionsConfigurationAbstractionsVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>9.0.1</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
<MicrosoftExtensionsConfigurationJsonVersion>9.0.1</MicrosoftExtensionsConfigurationJsonVersion>
<MicrosoftExtensionsDependencyInjectionVersion>9.0.1</MicrosoftExtensionsDependencyInjectionVersion>
<MicrosoftExtensionsDependencyModelVersion>9.0.1</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>9.0.1-servicing.24610.10</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
<MicrosoftExtensionsLoggingVersion>9.0.1</MicrosoftExtensionsLoggingVersion>
<MicrosoftNETCoreAppRefVersion>9.0.1</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>9.0.1</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETCoreBrowserDebugHostTransportVersion>9.0.1-servicing.24610.10</MicrosoftNETCoreBrowserDebugHostTransportVersion>
<SystemTextEncodingsWebVersion>9.0.1</SystemTextEncodingsWebVersion>
<SystemTextJsonVersion>9.0.1</SystemTextJsonVersion>
<SystemFormatsAsn1Version>9.0.1</SystemFormatsAsn1Version>
<MicrosoftExtensionsCachingMemoryVersion>9.0.2</MicrosoftExtensionsCachingMemoryVersion>
<MicrosoftExtensionsConfigurationVersion>9.0.2</MicrosoftExtensionsConfigurationVersion>
<MicrosoftExtensionsConfigurationAbstractionsVersion>9.0.2</MicrosoftExtensionsConfigurationAbstractionsVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>9.0.2</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
<MicrosoftExtensionsConfigurationJsonVersion>9.0.2</MicrosoftExtensionsConfigurationJsonVersion>
<MicrosoftExtensionsDependencyInjectionVersion>9.0.2</MicrosoftExtensionsDependencyInjectionVersion>
<MicrosoftExtensionsDependencyModelVersion>9.0.2</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>9.0.2-servicing.25066.10</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
<MicrosoftExtensionsLoggingVersion>9.0.2</MicrosoftExtensionsLoggingVersion>
<MicrosoftNETCoreAppRefVersion>9.0.2</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>9.0.2</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETCoreBrowserDebugHostTransportVersion>9.0.2-servicing.25066.10</MicrosoftNETCoreBrowserDebugHostTransportVersion>
<SystemTextEncodingsWebVersion>9.0.2</SystemTextEncodingsWebVersion>
<SystemTextJsonVersion>9.0.2</SystemTextJsonVersion>
<SystemFormatsAsn1Version>9.0.2</SystemFormatsAsn1Version>
</PropertyGroup>
<PropertyGroup Label="Dependencies from dotnet/arcade">
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.25077.4</MicrosoftDotNetBuildTasksTemplatingVersion>
Expand Down

0 comments on commit 54f9471

Please sign in to comment.