Merge commit '645f3131a5b0a4bf677201cf22773990a5316c89' into internal-merge-9.0-2024-11-12-1258
This commit is contained in:
Коммит
3c5b2015b5
|
@ -4,7 +4,7 @@
|
||||||
<clear />
|
<clear />
|
||||||
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
|
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
|
||||||
<!-- Begin: Package sources from dotnet-runtime -->
|
<!-- 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" />
|
<add key="darc-int-dotnet-runtime-9d5a6a9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-9d5a6a9a/nuget/v3/index.json" />
|
||||||
<!-- End: Package sources from dotnet-runtime -->
|
<!-- End: Package sources from dotnet-runtime -->
|
||||||
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
|
<!--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" />
|
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
|
||||||
|
@ -21,6 +21,7 @@
|
||||||
<clear />
|
<clear />
|
||||||
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
|
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
|
||||||
<!-- Begin: Package sources from dotnet-runtime -->
|
<!-- Begin: Package sources from dotnet-runtime -->
|
||||||
|
<add key="darc-int-dotnet-runtime-9d5a6a9" value="true" />
|
||||||
<!-- End: Package sources from dotnet-runtime -->
|
<!-- End: Package sources from dotnet-runtime -->
|
||||||
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
|
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
|
||||||
</disabledPackageSources>
|
</disabledPackageSources>
|
||||||
|
|
|
@ -2,68 +2,68 @@
|
||||||
<Dependencies>
|
<Dependencies>
|
||||||
<ProductDependencies>
|
<ProductDependencies>
|
||||||
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="9.0.0">
|
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="9.0.0">
|
||||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
|
||||||
<Sha>d3981726bc8b0e179db50301daf9f22d42393096</Sha>
|
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.0">
|
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.0">
|
||||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
|
||||||
<Sha>d3981726bc8b0e179db50301daf9f22d42393096</Sha>
|
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0">
|
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0">
|
||||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
|
||||||
<Sha>d3981726bc8b0e179db50301daf9f22d42393096</Sha>
|
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="9.0.0">
|
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="9.0.0">
|
||||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
|
||||||
<Sha>d3981726bc8b0e179db50301daf9f22d42393096</Sha>
|
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.Extensions.Configuration" Version="9.0.0">
|
<Dependency Name="Microsoft.Extensions.Configuration" Version="9.0.0">
|
||||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
|
||||||
<Sha>d3981726bc8b0e179db50301daf9f22d42393096</Sha>
|
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="9.0.0">
|
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="9.0.0">
|
||||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
|
||||||
<Sha>d3981726bc8b0e179db50301daf9f22d42393096</Sha>
|
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="9.0.0">
|
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="9.0.0">
|
||||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
|
||||||
<Sha>d3981726bc8b0e179db50301daf9f22d42393096</Sha>
|
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="9.0.0-rtm.24516.10">
|
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="9.0.0-rtm.24528.9">
|
||||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
|
||||||
<Sha>d3981726bc8b0e179db50301daf9f22d42393096</Sha>
|
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.Extensions.Logging" Version="9.0.0">
|
<Dependency Name="Microsoft.Extensions.Logging" Version="9.0.0">
|
||||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
|
||||||
<Sha>d3981726bc8b0e179db50301daf9f22d42393096</Sha>
|
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0">
|
<Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0">
|
||||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
|
||||||
<Sha>d3981726bc8b0e179db50301daf9f22d42393096</Sha>
|
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="9.0.0-rtm.24516.10">
|
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="9.0.0-rtm.24528.9">
|
||||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
|
||||||
<Sha>d3981726bc8b0e179db50301daf9f22d42393096</Sha>
|
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<!--
|
<!--
|
||||||
Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
|
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.
|
All Runtime.$rid packages should have the same version.
|
||||||
-->
|
-->
|
||||||
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.0">
|
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="9.0.0">
|
||||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
|
||||||
<Sha>d3981726bc8b0e179db50301daf9f22d42393096</Sha>
|
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="System.Text.Json" Version="9.0.0">
|
<Dependency Name="System.Text.Json" Version="9.0.0">
|
||||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
|
||||||
<Sha>d3981726bc8b0e179db50301daf9f22d42393096</Sha>
|
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="System.Text.Encodings.Web" Version="9.0.0">
|
<Dependency Name="System.Text.Encodings.Web" Version="9.0.0">
|
||||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
|
||||||
<Sha>d3981726bc8b0e179db50301daf9f22d42393096</Sha>
|
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
<Dependency Name="System.Formats.Asn1" Version="9.0.0">
|
<Dependency Name="System.Formats.Asn1" Version="9.0.0">
|
||||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
|
||||||
<Sha>d3981726bc8b0e179db50301daf9f22d42393096</Sha>
|
<Sha>9d5a6a9aa463d6d10b0b0ba6d5982cc82f363dc3</Sha>
|
||||||
</Dependency>
|
</Dependency>
|
||||||
</ProductDependencies>
|
</ProductDependencies>
|
||||||
<ToolsetDependencies>
|
<ToolsetDependencies>
|
||||||
|
|
|
@ -24,11 +24,11 @@
|
||||||
<MicrosoftExtensionsConfigurationJsonVersion>9.0.0</MicrosoftExtensionsConfigurationJsonVersion>
|
<MicrosoftExtensionsConfigurationJsonVersion>9.0.0</MicrosoftExtensionsConfigurationJsonVersion>
|
||||||
<MicrosoftExtensionsDependencyInjectionVersion>9.0.0</MicrosoftExtensionsDependencyInjectionVersion>
|
<MicrosoftExtensionsDependencyInjectionVersion>9.0.0</MicrosoftExtensionsDependencyInjectionVersion>
|
||||||
<MicrosoftExtensionsDependencyModelVersion>9.0.0</MicrosoftExtensionsDependencyModelVersion>
|
<MicrosoftExtensionsDependencyModelVersion>9.0.0</MicrosoftExtensionsDependencyModelVersion>
|
||||||
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>9.0.0-rtm.24516.10</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
|
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>9.0.0-rtm.24528.9</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
|
||||||
<MicrosoftExtensionsLoggingVersion>9.0.0</MicrosoftExtensionsLoggingVersion>
|
<MicrosoftExtensionsLoggingVersion>9.0.0</MicrosoftExtensionsLoggingVersion>
|
||||||
<MicrosoftNETCoreAppRefVersion>9.0.0</MicrosoftNETCoreAppRefVersion>
|
<MicrosoftNETCoreAppRefVersion>9.0.0</MicrosoftNETCoreAppRefVersion>
|
||||||
<MicrosoftNETCoreAppRuntimewinx64Version>9.0.0</MicrosoftNETCoreAppRuntimewinx64Version>
|
<MicrosoftNETCoreAppRuntimewinx64Version>9.0.0</MicrosoftNETCoreAppRuntimewinx64Version>
|
||||||
<MicrosoftNETCoreBrowserDebugHostTransportVersion>9.0.0-rtm.24516.10</MicrosoftNETCoreBrowserDebugHostTransportVersion>
|
<MicrosoftNETCoreBrowserDebugHostTransportVersion>9.0.0-rtm.24528.9</MicrosoftNETCoreBrowserDebugHostTransportVersion>
|
||||||
<SystemTextEncodingsWebVersion>9.0.0</SystemTextEncodingsWebVersion>
|
<SystemTextEncodingsWebVersion>9.0.0</SystemTextEncodingsWebVersion>
|
||||||
<SystemTextJsonVersion>9.0.0</SystemTextJsonVersion>
|
<SystemTextJsonVersion>9.0.0</SystemTextJsonVersion>
|
||||||
<SystemFormatsAsn1Version>9.0.0</SystemFormatsAsn1Version>
|
<SystemFormatsAsn1Version>9.0.0</SystemFormatsAsn1Version>
|
||||||
|
|
Загрузка…
Ссылка в новой задаче