Skip to content

Commit e878036

Browse files
authored
Merge pull request #34853 from vseanreesermsft/internal-merge-6.0-2024-10-08-1030
Merging internal commits for release/6.0
2 parents 1c624b2 + bc57976 commit e878036

File tree

3 files changed

+9
-7
lines changed

3 files changed

+9
-7
lines changed

NuGet.config

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<clear />
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-runtime -->
7+
<add key="darc-int-dotnet-runtime-b357f86" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-b357f86c/nuget/v3/index.json" />
78
<!-- End: Package sources from dotnet-runtime -->
89
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
910
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -18,6 +19,7 @@
1819
<clear />
1920
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2021
<!-- Begin: Package sources from dotnet-runtime -->
22+
<add key="darc-int-dotnet-runtime-b357f86" value="true" />
2123
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2224
<add key="darc-int-dotnet-runtime-cd08c36" value="true" />
2325
<add key="darc-int-dotnet-runtime-cb5f173" value="true" />

eng/Version.Details.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="6.0.1">
4+
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="6.0.2">
55
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
6-
<Sha>839cdfb0ecca5e0be3dbccd926e7651ef50fdf10</Sha>
6+
<Sha>b357f86ce3bce7c232ea242074b17bebdc50b543</Sha>
77
</Dependency>
88
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.1">
99
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -25,9 +25,9 @@
2525
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
2626
<Sha>5a400c212afdf8e675c9a1d38442e6d2f19f7b74</Sha>
2727
</Dependency>
28-
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="6.0.0">
29-
<Uri>https://github.com/dotnet/runtime</Uri>
30-
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
28+
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="6.0.1">
29+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
30+
<Sha>b357f86ce3bce7c232ea242074b17bebdc50b543</Sha>
3131
</Dependency>
3232
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="6.0.1-servicing.21567.5">
3333
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>

eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
<PropertyGroup Label="Dependencies from dotnet/runtime">
1717
<SystemCollectionsImmutableVersion>6.0.0</SystemCollectionsImmutableVersion>
1818
<SystemDiagnosticsDiagnosticSourceVersion>6.0.1</SystemDiagnosticsDiagnosticSourceVersion>
19-
<MicrosoftExtensionsCachingMemoryVersion>6.0.1</MicrosoftExtensionsCachingMemoryVersion>
19+
<MicrosoftExtensionsCachingMemoryVersion>6.0.2</MicrosoftExtensionsCachingMemoryVersion>
2020
<MicrosoftExtensionsConfigurationVersion>6.0.1</MicrosoftExtensionsConfigurationVersion>
2121
<MicrosoftExtensionsConfigurationAbstractionsVersion>6.0.0</MicrosoftExtensionsConfigurationAbstractionsVersion>
2222
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>6.0.1</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
2323
<MicrosoftExtensionsConfigurationJsonVersion>6.0.0</MicrosoftExtensionsConfigurationJsonVersion>
2424
<MicrosoftExtensionsDependencyInjectionVersion>6.0.1</MicrosoftExtensionsDependencyInjectionVersion>
25-
<MicrosoftExtensionsDependencyModelVersion>6.0.0</MicrosoftExtensionsDependencyModelVersion>
25+
<MicrosoftExtensionsDependencyModelVersion>6.0.1</MicrosoftExtensionsDependencyModelVersion>
2626
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>6.0.1-servicing.21567.5</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
2727
<MicrosoftExtensionsLoggingVersion>6.0.0</MicrosoftExtensionsLoggingVersion>
2828
<XUnitVersion>2.4.1</XUnitVersion>

0 commit comments

Comments
 (0)