Skip to content

Commit

Permalink
[release/9.0] Update dependencies from dotnet/runtime (#34927)
Browse files Browse the repository at this point in the history
[release/9.0] Update dependencies from dotnet/runtime


 - Pin runtime version to a non shipping package

 - Use a different package

 - Merge branch 'dkurepa/SetRuntimeVersionToNonShippingPackage' of https://github.com/dkurepa/efcore into darc-release/9.0-6cb07230-8c1b-4d20-83ee-f2550493f71d

 - Update deps

 - Update additional runtime version prop
  • Loading branch information
dotnet-maestro[bot] authored Oct 17, 2024
1 parent 4147693 commit b6b1453
Show file tree
Hide file tree
Showing 5 changed files with 50 additions and 44 deletions.
1 change: 1 addition & 0 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +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-pub-dotnet-runtime-d398172" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-d3981726/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 Down
60 changes: 32 additions & 28 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,65 +1,69 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="9.0.0-rtm.24516.5">
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="9.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>9305d7f71d73c1d1edeb2a06478c998e40deda8d</Sha>
<Sha>d3981726bc8b0e179db50301daf9f22d42393096</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.0-rtm.24516.5">
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>9305d7f71d73c1d1edeb2a06478c998e40deda8d</Sha>
<Sha>d3981726bc8b0e179db50301daf9f22d42393096</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0-rtm.24516.5">
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>9305d7f71d73c1d1edeb2a06478c998e40deda8d</Sha>
<Sha>d3981726bc8b0e179db50301daf9f22d42393096</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="9.0.0-rtm.24516.5">
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="9.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>9305d7f71d73c1d1edeb2a06478c998e40deda8d</Sha>
<Sha>d3981726bc8b0e179db50301daf9f22d42393096</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration" Version="9.0.0-rtm.24516.5">
<Dependency Name="Microsoft.Extensions.Configuration" Version="9.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>9305d7f71d73c1d1edeb2a06478c998e40deda8d</Sha>
<Sha>d3981726bc8b0e179db50301daf9f22d42393096</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="9.0.0-rtm.24516.5">
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="9.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>9305d7f71d73c1d1edeb2a06478c998e40deda8d</Sha>
<Sha>d3981726bc8b0e179db50301daf9f22d42393096</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="9.0.0-rtm.24516.5">
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="9.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>9305d7f71d73c1d1edeb2a06478c998e40deda8d</Sha>
<Sha>d3981726bc8b0e179db50301daf9f22d42393096</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="9.0.0-rtm.24516.5">
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="9.0.0-rtm.24516.10">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>9305d7f71d73c1d1edeb2a06478c998e40deda8d</Sha>
<Sha>d3981726bc8b0e179db50301daf9f22d42393096</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging" Version="9.0.0-rtm.24516.5">
<Dependency Name="Microsoft.Extensions.Logging" Version="9.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>9305d7f71d73c1d1edeb2a06478c998e40deda8d</Sha>
<Sha>d3981726bc8b0e179db50301daf9f22d42393096</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-rtm.24516.5">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>9305d7f71d73c1d1edeb2a06478c998e40deda8d</Sha>
<Sha>d3981726bc8b0e179db50301daf9f22d42393096</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="9.0.0-rtm.24516.10">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>d3981726bc8b0e179db50301daf9f22d42393096</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.0-rtm.24516.5">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>9305d7f71d73c1d1edeb2a06478c998e40deda8d</Sha>
<Sha>d3981726bc8b0e179db50301daf9f22d42393096</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="9.0.0-rtm.24516.5">
<Dependency Name="System.Text.Json" Version="9.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>9305d7f71d73c1d1edeb2a06478c998e40deda8d</Sha>
<Sha>d3981726bc8b0e179db50301daf9f22d42393096</Sha>
</Dependency>
<Dependency Name="System.Text.Encodings.Web" Version="9.0.0-rtm.24516.5">
<Dependency Name="System.Text.Encodings.Web" Version="9.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>9305d7f71d73c1d1edeb2a06478c998e40deda8d</Sha>
<Sha>d3981726bc8b0e179db50301daf9f22d42393096</Sha>
</Dependency>
<Dependency Name="System.Formats.Asn1" Version="9.0.0-rtm.24516.5">
<Dependency Name="System.Formats.Asn1" Version="9.0.0">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>9305d7f71d73c1d1edeb2a06478c998e40deda8d</Sha>
<Sha>d3981726bc8b0e179db50301daf9f22d42393096</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
29 changes: 15 additions & 14 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,21 @@
<UsingToolXliff>False</UsingToolXliff>
</PropertyGroup>
<PropertyGroup Label="Dependencies from dotnet/runtime">
<MicrosoftExtensionsCachingMemoryVersion>9.0.0-rtm.24516.5</MicrosoftExtensionsCachingMemoryVersion>
<MicrosoftExtensionsConfigurationVersion>9.0.0-rtm.24516.5</MicrosoftExtensionsConfigurationVersion>
<MicrosoftExtensionsConfigurationAbstractionsVersion>9.0.0-rtm.24516.5</MicrosoftExtensionsConfigurationAbstractionsVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>9.0.0-rtm.24516.5</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
<MicrosoftExtensionsConfigurationJsonVersion>9.0.0-rtm.24516.5</MicrosoftExtensionsConfigurationJsonVersion>
<MicrosoftExtensionsDependencyInjectionVersion>9.0.0-rtm.24516.5</MicrosoftExtensionsDependencyInjectionVersion>
<MicrosoftExtensionsDependencyModelVersion>9.0.0-rtm.24516.5</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>9.0.0-rtm.24516.5</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
<MicrosoftExtensionsLoggingVersion>9.0.0-rtm.24516.5</MicrosoftExtensionsLoggingVersion>
<MicrosoftNETCoreAppRefVersion>9.0.0-rtm.24516.5</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>9.0.0-rtm.24516.5</MicrosoftNETCoreAppRuntimewinx64Version>
<SystemTextEncodingsWebVersion>9.0.0-rtm.24516.5</SystemTextEncodingsWebVersion>
<SystemTextJsonVersion>9.0.0-rtm.24516.5</SystemTextJsonVersion>
<SystemFormatsAsn1Version>9.0.0-rtm.24516.5</SystemFormatsAsn1Version>
<MicrosoftExtensionsCachingMemoryVersion>9.0.0</MicrosoftExtensionsCachingMemoryVersion>
<MicrosoftExtensionsConfigurationVersion>9.0.0</MicrosoftExtensionsConfigurationVersion>
<MicrosoftExtensionsConfigurationAbstractionsVersion>9.0.0</MicrosoftExtensionsConfigurationAbstractionsVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>9.0.0</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
<MicrosoftExtensionsConfigurationJsonVersion>9.0.0</MicrosoftExtensionsConfigurationJsonVersion>
<MicrosoftExtensionsDependencyInjectionVersion>9.0.0</MicrosoftExtensionsDependencyInjectionVersion>
<MicrosoftExtensionsDependencyModelVersion>9.0.0</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>9.0.0-rtm.24516.10</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
<MicrosoftExtensionsLoggingVersion>9.0.0</MicrosoftExtensionsLoggingVersion>
<MicrosoftNETCoreAppRefVersion>9.0.0</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>9.0.0</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETCoreBrowserDebugHostTransportVersion>9.0.0-rtm.24516.10</MicrosoftNETCoreBrowserDebugHostTransportVersion>
<SystemTextEncodingsWebVersion>9.0.0</SystemTextEncodingsWebVersion>
<SystemTextJsonVersion>9.0.0</SystemTextJsonVersion>
<SystemFormatsAsn1Version>9.0.0</SystemFormatsAsn1Version>
</PropertyGroup>
<PropertyGroup Label="Dependencies from dotnet/arcade">
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24516.2</MicrosoftDotNetBuildTasksTemplatingVersion>
Expand Down
2 changes: 1 addition & 1 deletion eng/helix.proj
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<SasToken>$([System.Environment]::GetEnvironmentVariable('DotNetBuildsInternalReadSasToken'))</SasToken>
</AdditionalDotNetPackageFeed>

<AdditionalDotNetPackage Include="$(MicrosoftNETCoreAppRuntimewinx64Version)">
<AdditionalDotNetPackage Include="$(MicrosoftNETCoreBrowserDebugHostTransportVersion)">
<PackageType>runtime</PackageType>
</AdditionalDotNetPackage>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"dotnet": "9.0.100-rc.2.24474.11",
"runtimes": {
"dotnet": [
"$(MicrosoftNETCoreAppRuntimewinx64Version)"
"$(MicrosoftNETCoreBrowserDebugHostTransportVersion)"
]
}
},
Expand Down

0 comments on commit b6b1453

Please sign in to comment.