Skip to content

Commit

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


 - Merge branch 'main' into darc-main-1d8cb337-f1ee-4b22-8b2b-7d4ba020849b

 - Merge branch 'main' into darc-main-1d8cb337-f1ee-4b22-8b2b-7d4ba020849b

 - Add the dotnet10 nuget feeds

 - Add them to the mapping too
  • Loading branch information
dotnet-maestro[bot] authored Sep 22, 2024
1 parent e84a366 commit 3af5cdf
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 42 deletions.
8 changes: 8 additions & 0 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,19 @@
<add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" />
<add key="dotnet9" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9/nuget/v3/index.json" />
<add key="dotnet9-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet9-transport/nuget/v3/index.json" />
<add key="dotnet10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10/nuget/v3/index.json" />
<add key="dotnet10-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10-transport/nuget/v3/index.json" />
<add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
<!-- Used for the Rich Navigation indexing task -->
<add key="richnav" value="https://pkgs.dev.azure.com/azure-public/vside/_packaging/vs-buildservices/nuget/v3/index.json" />
</packageSources>
<packageSourceMapping>
<packageSource key="dotnet10-transport">
<package pattern="*" />
</packageSource>
<packageSource key="dotnet10">
<package pattern="*" />
</packageSource>
<packageSource key="dotnet9-transport">
<package pattern="*" />
</packageSource>
Expand Down
56 changes: 28 additions & 28 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,65 +1,65 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="9.0.0-rc.2.24456.9">
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.0-alpha.1.24463.8">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>dec716d1c4651b70e4710e781e832a64be1e713b</Sha>
<Sha>f1bcbeb5fa2fe84698b62d88dd35199f0d7fbedb</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.0-rc.2.24456.9">
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0-alpha.1.24463.8">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>dec716d1c4651b70e4710e781e832a64be1e713b</Sha>
<Sha>f1bcbeb5fa2fe84698b62d88dd35199f0d7fbedb</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0-rc.2.24456.9">
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0-alpha.1.24463.8">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>dec716d1c4651b70e4710e781e832a64be1e713b</Sha>
<Sha>f1bcbeb5fa2fe84698b62d88dd35199f0d7fbedb</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="9.0.0-rc.2.24456.9">
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.0-alpha.1.24463.8">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>dec716d1c4651b70e4710e781e832a64be1e713b</Sha>
<Sha>f1bcbeb5fa2fe84698b62d88dd35199f0d7fbedb</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Configuration" Version="9.0.0-rc.2.24456.9">
<Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.0-alpha.1.24463.8">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>dec716d1c4651b70e4710e781e832a64be1e713b</Sha>
<Sha>f1bcbeb5fa2fe84698b62d88dd35199f0d7fbedb</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="9.0.0-rc.2.24456.9">
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.0-alpha.1.24463.8">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>dec716d1c4651b70e4710e781e832a64be1e713b</Sha>
<Sha>f1bcbeb5fa2fe84698b62d88dd35199f0d7fbedb</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="9.0.0-rc.2.24456.9">
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.0-alpha.1.24463.8">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>dec716d1c4651b70e4710e781e832a64be1e713b</Sha>
<Sha>f1bcbeb5fa2fe84698b62d88dd35199f0d7fbedb</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="9.0.0-rc.2.24456.9">
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.0-alpha.1.24463.8">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>dec716d1c4651b70e4710e781e832a64be1e713b</Sha>
<Sha>f1bcbeb5fa2fe84698b62d88dd35199f0d7fbedb</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging" Version="9.0.0-rc.2.24456.9">
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0-alpha.1.24463.8">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>dec716d1c4651b70e4710e781e832a64be1e713b</Sha>
<Sha>f1bcbeb5fa2fe84698b62d88dd35199f0d7fbedb</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-rc.2.24456.9">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-alpha.1.24463.8">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>dec716d1c4651b70e4710e781e832a64be1e713b</Sha>
<Sha>f1bcbeb5fa2fe84698b62d88dd35199f0d7fbedb</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-rc.2.24456.9">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="10.0.0-alpha.1.24463.8">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>dec716d1c4651b70e4710e781e832a64be1e713b</Sha>
<Sha>f1bcbeb5fa2fe84698b62d88dd35199f0d7fbedb</Sha>
</Dependency>
<Dependency Name="System.Text.Json" Version="9.0.0-rc.2.24456.9">
<Dependency Name="System.Text.Json" Version="10.0.0-alpha.1.24463.8">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>dec716d1c4651b70e4710e781e832a64be1e713b</Sha>
<Sha>f1bcbeb5fa2fe84698b62d88dd35199f0d7fbedb</Sha>
</Dependency>
<Dependency Name="System.Text.Encodings.Web" Version="9.0.0-rc.2.24456.9">
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-alpha.1.24463.8">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>dec716d1c4651b70e4710e781e832a64be1e713b</Sha>
<Sha>f1bcbeb5fa2fe84698b62d88dd35199f0d7fbedb</Sha>
</Dependency>
<Dependency Name="System.Formats.Asn1" Version="9.0.0-rc.2.24456.9">
<Dependency Name="System.Formats.Asn1" Version="10.0.0-alpha.1.24463.8">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>dec716d1c4651b70e4710e781e832a64be1e713b</Sha>
<Sha>f1bcbeb5fa2fe84698b62d88dd35199f0d7fbedb</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
28 changes: 14 additions & 14 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,20 @@
<UsingToolXliff>False</UsingToolXliff>
</PropertyGroup>
<PropertyGroup Label="Dependencies from dotnet/runtime">
<MicrosoftExtensionsCachingMemoryVersion>9.0.0-rc.2.24456.9</MicrosoftExtensionsCachingMemoryVersion>
<MicrosoftExtensionsConfigurationVersion>9.0.0-rc.2.24456.9</MicrosoftExtensionsConfigurationVersion>
<MicrosoftExtensionsConfigurationAbstractionsVersion>9.0.0-rc.2.24456.9</MicrosoftExtensionsConfigurationAbstractionsVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>9.0.0-rc.2.24456.9</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
<MicrosoftExtensionsConfigurationJsonVersion>9.0.0-rc.2.24456.9</MicrosoftExtensionsConfigurationJsonVersion>
<MicrosoftExtensionsDependencyInjectionVersion>9.0.0-rc.2.24456.9</MicrosoftExtensionsDependencyInjectionVersion>
<MicrosoftExtensionsDependencyModelVersion>9.0.0-rc.2.24456.9</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>9.0.0-rc.2.24456.9</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
<MicrosoftExtensionsLoggingVersion>9.0.0-rc.2.24456.9</MicrosoftExtensionsLoggingVersion>
<MicrosoftNETCoreAppRefVersion>9.0.0-rc.2.24456.9</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>9.0.0-rc.2.24456.9</MicrosoftNETCoreAppRuntimewinx64Version>
<SystemTextEncodingsWebVersion>9.0.0-rc.2.24456.9</SystemTextEncodingsWebVersion>
<SystemTextJsonVersion>9.0.0-rc.2.24456.9</SystemTextJsonVersion>
<SystemFormatsAsn1Version>9.0.0-rc.2.24456.9</SystemFormatsAsn1Version>
<MicrosoftExtensionsCachingMemoryVersion>10.0.0-alpha.1.24463.8</MicrosoftExtensionsCachingMemoryVersion>
<MicrosoftExtensionsConfigurationVersion>10.0.0-alpha.1.24463.8</MicrosoftExtensionsConfigurationVersion>
<MicrosoftExtensionsConfigurationAbstractionsVersion>10.0.0-alpha.1.24463.8</MicrosoftExtensionsConfigurationAbstractionsVersion>
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>10.0.0-alpha.1.24463.8</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
<MicrosoftExtensionsConfigurationJsonVersion>10.0.0-alpha.1.24463.8</MicrosoftExtensionsConfigurationJsonVersion>
<MicrosoftExtensionsDependencyInjectionVersion>10.0.0-alpha.1.24463.8</MicrosoftExtensionsDependencyInjectionVersion>
<MicrosoftExtensionsDependencyModelVersion>10.0.0-alpha.1.24463.8</MicrosoftExtensionsDependencyModelVersion>
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>10.0.0-alpha.1.24463.8</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
<MicrosoftExtensionsLoggingVersion>10.0.0-alpha.1.24463.8</MicrosoftExtensionsLoggingVersion>
<MicrosoftNETCoreAppRefVersion>10.0.0-alpha.1.24463.8</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>10.0.0-alpha.1.24463.8</MicrosoftNETCoreAppRuntimewinx64Version>
<SystemTextEncodingsWebVersion>10.0.0-alpha.1.24463.8</SystemTextEncodingsWebVersion>
<SystemTextJsonVersion>10.0.0-alpha.1.24463.8</SystemTextJsonVersion>
<SystemFormatsAsn1Version>10.0.0-alpha.1.24463.8</SystemFormatsAsn1Version>
</PropertyGroup>
<PropertyGroup Label="Dependencies from dotnet/arcade">
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.24463.4</MicrosoftDotNetBuildTasksTemplatingVersion>
Expand Down

0 comments on commit 3af5cdf

Please sign in to comment.