Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merging internal commits for release/9.0 #35622

Merged
merged 8 commits into from
Feb 11, 2025
Merged

Merging internal commits for release/9.0 #35622

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
bc013a9
Merge commit '892d924bac63f829dd6b97b1ddd7289d415778ca'
Jan 6, 2025
dbebf53
Merge commit 'ca340086e5769a43dc6976d4daa6bef56a955b73'
Jan 7, 2025
14366dd
Merge commit '32f03a4b86ead9591c3db5b032d8cb798b99c9b1'
Jan 13, 2025
b57f089
Merge commit 'ed9776a955c3be9eecf8ab9951fe050448b5c755'
Jan 14, 2025
2167ccb
Merge commit '8b0e059149f6fb0e8d0352991d63d24c013d60f6'
Jan 14, 2025
e8369fc
Merge commit '874dc9640bdaeb6fd8d5a55a87e3cca35816150a'
Jan 15, 2025
7bb42e8
Merged PR 46816: [internal/release/9.0] Update dependencies from dnce…
Jan 17, 2025
f3c6eb1
Merge commit '7bb42e8dd6df45b8570b7cb7ccdcfd5fb6460b0e' into internal…
vseanreesermsft Feb 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions NuGet.config
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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