Skip to content

Commit 7ad54b2

Browse files
Merge commit '3c77f324941bb9ac4f141e081e486d3c76c1ecde' into internal-merge-8.0-2026-01-13-1154
2 parents 9181d9c + 3c77f32 commit 7ad54b2

4 files changed

Lines changed: 15 additions & 13 deletions

File tree

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-c96cd11" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-c96cd11c/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-c96cd11" value="true" />
2123
<!-- End: Package sources from dotnet-runtime -->
2224
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2325
</disabledPackageSources>

azure-pipelines.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ extends:
218218
- name: _HelixBuildConfig
219219
value: $(_BuildConfig)
220220
- name: HelixTargetQueues
221-
value: Windows.10.Amd64;Ubuntu.2204.Amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-helix-sqlserver-amd64
221+
value: Windows.10.Amd64;Ubuntu.2204.Amd64@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-22.04-helix-sqlserver-amd64
222222
- name: _HelixAccessToken
223223
# Needed for internal queues
224224
value: $(HelixApiAccessToken)

eng/Version.Details.xml

Lines changed: 8 additions & 8 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.22-servicing.25527.7">
32+
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="8.0.23-servicing.25606.7">
3333
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
34-
<Sha>a2266c728f63a494ccb6786d794da2df135030be</Sha>
34+
<Sha>c96cd11cb2f0c204f272b2280082a329aee24cf7</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>
@@ -45,18 +45,18 @@
4545
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
4646
<Sha>ef853a71052646a42abf17e888ec6d9a69614ad9</Sha>
4747
</Dependency>
48-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.22">
48+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.23">
4949
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
50-
<Sha>a2266c728f63a494ccb6786d794da2df135030be</Sha>
50+
<Sha>c96cd11cb2f0c204f272b2280082a329aee24cf7</Sha>
5151
</Dependency>
52-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.22">
52+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.23">
5353
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
54-
<Sha>a2266c728f63a494ccb6786d794da2df135030be</Sha>
54+
<Sha>c96cd11cb2f0c204f272b2280082a329aee24cf7</Sha>
5555
</Dependency>
5656
<!-- NB: Using BrowserDebugHost to represent the nonshipping version of Microsoft.NETCore.App -->
57-
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="8.0.22-servicing.25527.7">
57+
<Dependency Name="Microsoft.NETCore.BrowserDebugHost.Transport" Version="8.0.23-servicing.25606.7">
5858
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
59-
<Sha>a2266c728f63a494ccb6786d794da2df135030be</Sha>
59+
<Sha>c96cd11cb2f0c204f272b2280082a329aee24cf7</Sha>
6060
</Dependency>
6161
</ProductDependencies>
6262
<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.22-servicing.25527.7</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
27+
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>8.0.23-servicing.25606.7</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
2828
<MicrosoftExtensionsLoggingVersion>8.0.1</MicrosoftExtensionsLoggingVersion>
2929
<SystemTextJsonVersion>8.0.6</SystemTextJsonVersion>
3030
<SystemFormatsAsn1Version>8.0.2</SystemFormatsAsn1Version>
31-
<MicrosoftNETCoreAppRefVersion>8.0.22</MicrosoftNETCoreAppRefVersion>
32-
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.22</MicrosoftNETCoreAppRuntimewinx64Version>
33-
<MicrosoftNETCoreBrowserDebugHostTransportVersion>8.0.22-servicing.25527.7</MicrosoftNETCoreBrowserDebugHostTransportVersion>
31+
<MicrosoftNETCoreAppRefVersion>8.0.23</MicrosoftNETCoreAppRefVersion>
32+
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.23</MicrosoftNETCoreAppRuntimewinx64Version>
33+
<MicrosoftNETCoreBrowserDebugHostTransportVersion>8.0.23-servicing.25606.7</MicrosoftNETCoreBrowserDebugHostTransportVersion>
3434
</PropertyGroup>
3535
<PropertyGroup Label="Dependencies from dotnet/arcade">
3636
<MicrosoftDotNetBuildTasksTemplatingVersion>8.0.0-beta.25611.2</MicrosoftDotNetBuildTasksTemplatingVersion>

0 commit comments

Comments
 (0)