Skip to content

Commit b111d2a

Browse files
AndriySvyrydAndriySvyryd
authored
Merge pull request #35081
Merging internal commits for release/8.0
2 parents e63ad4a + e99d7c7 commit b111d2a

File tree

3 files changed

+24
-15
lines changed

3 files changed

+24
-15
lines changed

‎NuGet.config‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-runtime -->
77
<add key="darc-int-dotnet-runtime-dcf4a22" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-dcf4a22c/nuget/v3/index.json" />
8+
<add key="darc-int-dotnet-runtime-9cb3b72" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-9cb3b725/nuget/v3/index.json" />
9+
<add key="darc-int-dotnet-runtime-2aade6b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2aade6be/nuget/v3/index.json" />
10+
<add key="darc-int-dotnet-runtime-2aade6b-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2aade6be-5/nuget/v3/index.json" />
11+
<add key="darc-int-dotnet-runtime-2aade6b-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2aade6be-3/nuget/v3/index.json" />
12+
<add key="darc-int-dotnet-runtime-2aade6b-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2aade6be-2/nuget/v3/index.json" />
13+
<add key="darc-int-dotnet-runtime-2aade6b-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2aade6be-1/nuget/v3/index.json" />
814
<!-- End: Package sources from dotnet-runtime -->
915
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1016
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -19,6 +25,12 @@
1925
<clear />
2026
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2127
<!-- Begin: Package sources from dotnet-runtime -->
28+
<add key="darc-int-dotnet-runtime-2aade6b-1" value="true" />
29+
<add key="darc-int-dotnet-runtime-2aade6b-2" value="true" />
30+
<add key="darc-int-dotnet-runtime-2aade6b-3" value="true" />
31+
<add key="darc-int-dotnet-runtime-2aade6b-5" value="true" />
32+
<add key="darc-int-dotnet-runtime-2aade6b" value="true" />
33+
<add key="darc-int-dotnet-runtime-9cb3b72" value="true" />
2234
<add key="darc-int-dotnet-runtime-dcf4a22" value="true" />
2335
<!-- End: Package sources from dotnet-runtime -->
2436
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->

‎eng/Version.Details.xml‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
3030
<Sha>dcf4a22cf8671c1abe880ebec4cfd906c99588bf</Sha>
3131
</Dependency>
32-
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="8.0.10-servicing.24474.6">
32+
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="8.0.11-servicing.24517.7">
3333
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
34-
<Sha>dcf4a22cf8671c1abe880ebec4cfd906c99588bf</Sha>
34+
<Sha>9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5</Sha>
3535
</Dependency>
3636
<Dependency Name="Microsoft.Extensions.Logging" Version="8.0.1">
3737
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -40,26 +40,23 @@
4040
<Dependency Name="System.Formats.Asn1" Version="8.0.1">
4141
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
4242
<Sha>2aade6beb02ea367fd97c4070a4198802fe61c03</Sha>
43-
</Dependency>
44-
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
45-
<Sha>2aade6beb02ea367fd97c4070a4198802fe61c03</Sha>
4643
</Dependency>
4744
<Dependency Name="System.Text.Json" Version="8.0.5">
4845
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
4946
<Sha>dcf4a22cf8671c1abe880ebec4cfd906c99588bf</Sha>
5047
</Dependency>
51-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.10">
48+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.11">
5249
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
53-
<Sha>dcf4a22cf8671c1abe880ebec4cfd906c99588bf</Sha>
50+
<Sha>9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5</Sha>
5451
</Dependency>
55-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.10">
52+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.11">
5653
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
57-
<Sha>dcf4a22cf8671c1abe880ebec4cfd906c99588bf</Sha>
54+
<Sha>9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5</Sha>
5855
</Dependency>
5956
<!-- NB: Using BrowserDebugHost to represent the nonshipping version of Microsoft.NETCore.App -->
60-
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="8.0.10-servicing.24474.6">
57+
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="8.0.11-servicing.24517.7">
6158
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
62-
<Sha>dcf4a22cf8671c1abe880ebec4cfd906c99588bf</Sha>
59+
<Sha>9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5</Sha>
6360
</Dependency>
6461
</ProductDependencies>
6562
<ToolsetDependencies>

‎eng/Versions.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@
2424
<MicrosoftExtensionsConfigurationJsonVersion>8.0.1</MicrosoftExtensionsConfigurationJsonVersion>
2525
<MicrosoftExtensionsDependencyInjectionVersion>8.0.1</MicrosoftExtensionsDependencyInjectionVersion>
2626
<MicrosoftExtensionsDependencyModelVersion>8.0.2</MicrosoftExtensionsDependencyModelVersion>
27-
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>8.0.11-servicing.24508.13</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
27+
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>8.0.11-servicing.24517.7</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
2828
<MicrosoftExtensionsLoggingVersion>8.0.1</MicrosoftExtensionsLoggingVersion>
2929
<SystemTextJsonVersion>8.0.5</SystemTextJsonVersion>
3030
<SystemFormatsAsn1Version>8.0.1</SystemFormatsAsn1Version>
31-
<MicrosoftNETCoreAppRefVersion>8.0.10</MicrosoftNETCoreAppRefVersion>
32-
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.10</MicrosoftNETCoreAppRuntimewinx64Version>
33-
<MicrosoftNETCoreBrowserDebugHostTransportVersion>8.0.11-servicing.24508.13</MicrosoftNETCoreBrowserDebugHostTransportVersion>
31+
<MicrosoftNETCoreAppRefVersion>8.0.11</MicrosoftNETCoreAppRefVersion>
32+
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.11</MicrosoftNETCoreAppRuntimewinx64Version>
33+
<MicrosoftNETCoreBrowserDebugHostTransportVersion>8.0.11-servicing.24517.7</MicrosoftNETCoreBrowserDebugHostTransportVersion>
3434
</PropertyGroup>
3535
<PropertyGroup Label="Dependencies from dotnet/arcade">
3636
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.24508.1</MicrosoftDotNetBuildTasksTemplatingVersion>

0 commit comments

Comments
 (0)