Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
191dd3a
Update dependencies from https://github.com/dotnet/dotnet build 20251…
dotnet-maestro[bot] Dec 16, 2025
7efa86b
Re-generate global.json for PR #24455: [release/10.0.1xx] Update depe…
Dec 16, 2025
9e8b8f4
Update dependencies from https://github.com/dotnet/dotnet build 20251…
dotnet-maestro[bot] Dec 18, 2025
cfdeab6
Re-generate global.json for PR #24455: [release/10.0.1xx] Update depe…
Dec 18, 2025
452b4f4
Update dependencies from https://github.com/dotnet/dotnet build 20251…
dotnet-maestro[bot] Dec 19, 2025
449617f
Re-generate global.json for PR #24455: [release/10.0.1xx] Update depe…
Dec 19, 2025
61b1ab7
Update dependencies from https://github.com/dotnet/dotnet build 20251…
dotnet-maestro[bot] Dec 20, 2025
d89484a
Re-generate global.json for PR #24455: [release/10.0.1xx] Update depe…
Dec 20, 2025
d7710cc
Update dependencies from https://github.com/dotnet/dotnet build 20251…
dotnet-maestro[bot] Dec 21, 2025
a5e5a8d
Re-generate global.json for PR #24455: [release/10.0.1xx] Update depe…
Dec 21, 2025
d9a0585
Update dependencies from https://github.com/dotnet/dotnet build 20251…
dotnet-maestro[bot] Dec 24, 2025
6225fa3
Re-generate global.json for PR #24455: [release/10.0.1xx] Update depe…
Dec 24, 2025
51e6a93
Update dependencies from https://github.com/dotnet/dotnet build 20251…
dotnet-maestro[bot] Dec 26, 2025
8491c3d
Re-generate global.json for PR #24455: [release/10.0.1xx] Update depe…
Dec 26, 2025
9b1aede
Update dependencies from https://github.com/dotnet/dotnet build 20251…
dotnet-maestro[bot] Dec 29, 2025
2c0416b
Re-generate global.json for PR #24455: [release/10.0.1xx] Update depe…
Dec 29, 2025
789b004
Update dependencies from https://github.com/dotnet/dotnet build 20251…
dotnet-maestro[bot] Dec 31, 2025
d5825ac
Re-generate global.json for PR #24455: [release/10.0.1xx] Update depe…
Dec 31, 2025
2f3f701
Update dependencies from https://github.com/dotnet/dotnet build 20251…
dotnet-maestro[bot] Jan 1, 2026
de4aca2
Re-generate global.json for PR #24455: [release/10.0.1xx] Update depe…
Jan 1, 2026
3f3000f
Merge remote-tracking branch 'origin/release/10.0.1xx' into darc-rele…
rolfbjarne Jan 5, 2026
750b5f3
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] Jan 7, 2026
b658415
Re-generate global.json for PR #24455: [release/10.0.1xx] Update depe…
Jan 7, 2026
03dbca7
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] Jan 8, 2026
43a569d
Re-generate global.json for PR #24455: [release/10.0.1xx] Update depe…
Jan 8, 2026
30684ed
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] Jan 9, 2026
79e449b
Re-generate global.json for PR #24455: [release/10.0.1xx] Update depe…
Jan 9, 2026
22518d0
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] Jan 14, 2026
007db43
Re-generate global.json for PR #24455: [release/10.0.1xx] Update depe…
Jan 14, 2026
4b4462c
Add a 9.0.13 feed.
rolfbjarne Jan 14, 2026
cb8e8dc
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] Jan 15, 2026
d0e03ee
Re-generate global.json for PR #24455: [release/10.0.1xx] Update depe…
Jan 15, 2026
4875ffb
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] Jan 16, 2026
c849035
Re-generate global.json for PR #24455: [release/10.0.1xx] Update depe…
Jan 16, 2026
9f9dcce
Update dependencies from https://github.com/dotnet/dotnet build 20260…
dotnet-maestro[bot] Jan 21, 2026
d853d1f
Re-generate global.json for PR #24455: [release/10.0.1xx] Update depe…
Jan 21, 2026
00ed52b
Add a 8.0.24 feed.
rolfbjarne Jan 21, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions NuGet.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<config>
<!-- use a local package folder because we produce nuget packages which may end up having to be cleaned,
Expand All @@ -10,7 +10,7 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-dotnet -->
<add key="darc-pub-dotnet-dotnet-9441e5b" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-9441e5bb/nuget/v3/index.json" />
<add key="darc-pub-dotnet-dotnet-455f135" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-dotnet-455f1358/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-dotnet -->
<!-- Begin: Package sources from dotnet-macios -->
<add key="darc-pub-dotnet-macios-e6a0fb7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-macios-e6a0fb79/nuget/v3/index.json" />
Expand Down Expand Up @@ -38,10 +38,14 @@
<add key="darc-pub-dotnet-runtime-ad2d4fbc" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-ad2d4fbc/nuget/v3/index.json" />
<!-- Add a 8.0.23 feed -->
<add key="darc-pub-dotnet-runtime-891f8976" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-891f8976/nuget/v3/index.json" />
<!-- Add a 8.0.24 feed -->
<add key="darc-pub-dotnet-runtime-b43df221" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-b43df221/nuget/v3/index.json" />
<!-- Add a 9.0.11 feed -->
<add key="darc-pub-dotnet-runtime-35fe9c61" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-35fe9c61/nuget/v3/index.json" />
<!-- Add a 9.0.12 feed -->
<add key="darc-pub-dotnet-runtime-9c2fb4b7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-9c2fb4b7/nuget/v3/index.json" />
<!-- Add a 9.0.13 feed -->
<add key="darc-pub-dotnet-runtime-7dd1559a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-7dd1559a/nuget/v3/index.json" />
</packageSources>
<disabledPackageSources>
<clear />
Expand Down
20 changes: 10 additions & 10 deletions eng/Version.Details.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,16 @@ This file should be imported by eng/Versions.props
<Project>
<PropertyGroup>
<!-- dotnet/dotnet dependencies -->
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25612.111</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>10.0.0-beta.25612.111</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.25612.111</MicrosoftDotNetCecilPackageVersion>
<MicrosoftDotNetSharedFrameworkSdkPackageVersion>10.0.0-beta.25612.111</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
<MicrosoftNETILLinkPackageVersion>10.0.2-servicing.25612.111</MicrosoftNETILLinkPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>10.0.2</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>10.0.2</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
<MicrosoftNETSdkPackageVersion>10.0.102-servicing.25612.111</MicrosoftNETSdkPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.2</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>10.0.102</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.26070.104</MicrosoftDotNetArcadeSdkPackageVersion>
<MicrosoftDotNetBuildTasksFeedPackageVersion>10.0.0-beta.26070.104</MicrosoftDotNetBuildTasksFeedPackageVersion>
<MicrosoftDotNetCecilPackageVersion>0.11.5-alpha.26070.104</MicrosoftDotNetCecilPackageVersion>
<MicrosoftDotNetSharedFrameworkSdkPackageVersion>10.0.0-beta.26070.104</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
<MicrosoftNETILLinkPackageVersion>10.0.3-servicing.26070.104</MicrosoftNETILLinkPackageVersion>
<MicrosoftNETILLinkTasksPackageVersion>10.0.3</MicrosoftNETILLinkTasksPackageVersion>
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>10.0.3</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
<MicrosoftNETSdkPackageVersion>10.0.103-servicing.26070.104</MicrosoftNETSdkPackageVersion>
<MicrosoftNETCoreAppRefPackageVersion>10.0.3</MicrosoftNETCoreAppRefPackageVersion>
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>10.0.103</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
<!-- dotnet/macios dependencies -->
<MicrosoftiOSSdknet100_260PackageVersion>26.0.11017</MicrosoftiOSSdknet100_260PackageVersion>
<MicrosoftiOSSdknet90_185PackageVersion>18.5.9227</MicrosoftiOSSdknet90_185PackageVersion>
Expand Down
40 changes: 20 additions & 20 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,29 +1,29 @@
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.102-servicing.25612.111">
<Dependency Name="Microsoft.NET.Sdk" Version="10.0.103-servicing.26070.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>9441e5bb35fae9e956fdac4bd33ee537175e6d60</Sha>
<Sha>455f1358f39b4d38fa3893c327a45027c4a81843</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink" Version="10.0.2-servicing.25612.111">
<Dependency Name="Microsoft.NET.ILLink" Version="10.0.3-servicing.26070.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>9441e5bb35fae9e956fdac4bd33ee537175e6d60</Sha>
<Sha>455f1358f39b4d38fa3893c327a45027c4a81843</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="10.0.2">
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="10.0.3">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>9441e5bb35fae9e956fdac4bd33ee537175e6d60</Sha>
<Sha>455f1358f39b4d38fa3893c327a45027c4a81843</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Runtime.MonoTargets.Sdk" Version="10.0.2">
<Dependency Name="Microsoft.NET.Runtime.MonoTargets.Sdk" Version="10.0.3">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>9441e5bb35fae9e956fdac4bd33ee537175e6d60</Sha>
<Sha>455f1358f39b4d38fa3893c327a45027c4a81843</Sha>
</Dependency>
<!-- Set TRACKING_DOTNET_RUNTIME_SEPARATELY to something in Make.config if changing the version outside of dependency flow -->
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.2">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.3">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>9441e5bb35fae9e956fdac4bd33ee537175e6d60</Sha>
<Sha>455f1358f39b4d38fa3893c327a45027c4a81843</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.25612.111">
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-alpha.26070.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>9441e5bb35fae9e956fdac4bd33ee537175e6d60</Sha>
<Sha>455f1358f39b4d38fa3893c327a45027c4a81843</Sha>
</Dependency>
<!-- This is a subscription of the .NET 9 latest stable versions of our packages -->
<Dependency Name="Microsoft.MacCatalyst.Sdk.net9.0_18.5" Version="18.5.9227">
Expand Down Expand Up @@ -95,25 +95,25 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.25612.111">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="10.0.0-beta.26070.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>9441e5bb35fae9e956fdac4bd33ee537175e6d60</Sha>
<Sha>455f1358f39b4d38fa3893c327a45027c4a81843</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.25612.111">
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="10.0.0-beta.26070.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>9441e5bb35fae9e956fdac4bd33ee537175e6d60</Sha>
<Sha>455f1358f39b4d38fa3893c327a45027c4a81843</Sha>
</Dependency>
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="10.0.102">
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="10.0.103">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>9441e5bb35fae9e956fdac4bd33ee537175e6d60</Sha>
<Sha>455f1358f39b4d38fa3893c327a45027c4a81843</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XHarness.iOS.Shared" Version="11.0.0-prerelease.25603.1">
<Uri>https://github.com/dotnet/xharness</Uri>
<Sha>3df2923500447ee925d59f026c81720c7a9b4e4b</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25612.111">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.26070.104">
<Uri>https://github.com/dotnet/dotnet</Uri>
<Sha>9441e5bb35fae9e956fdac4bd33ee537175e6d60</Sha>
<Sha>455f1358f39b4d38fa3893c327a45027c4a81843</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
</ToolsetDependencies>
Expand Down
2 changes: 1 addition & 1 deletion eng/common/core-templates/job/publish-build-assets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ jobs:
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
name: NetCore1ESPool-Publishing-Internal
image: windows.vs2019.amd64
image: windows.vs2022.amd64
os: windows
steps:
- ${{ if eq(parameters.is1ESPipeline, '') }}:
Expand Down
4 changes: 2 additions & 2 deletions eng/common/core-templates/post-build/post-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -293,11 +293,11 @@ stages:
${{ else }}:
${{ if eq(parameters.is1ESPipeline, true) }}:
name: NetCore1ESPool-Publishing-Internal
image: windows.vs2019.amd64
image: windows.vs2022.amd64
os: windows
${{ else }}:
name: NetCore1ESPool-Publishing-Internal
demands: ImageOverride -equals windows.vs2019.amd64
demands: ImageOverride -equals windows.vs2022.amd64
steps:
- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
parameters:
Expand Down
2 changes: 1 addition & 1 deletion eng/common/templates/variables/pool-providers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#
# pool:
# name: $(DncEngInternalBuildPool)
# demands: ImageOverride -equals windows.vs2019.amd64
# demands: ImageOverride -equals windows.vs2022.amd64
variables:
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- template: /eng/common/templates-official/variables/pool-providers.yml
Expand Down
13 changes: 10 additions & 3 deletions eng/common/tools.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -560,19 +560,26 @@ function LocateVisualStudio([object]$vsRequirements = $null){
})
}

if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs }
if (!$vsRequirements) {
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs' -ErrorAction SilentlyContinue) {
$vsRequirements = $GlobalJson.tools.vs
} else {
$vsRequirements = $null
}
}

$args = @('-latest', '-format', 'json', '-requires', 'Microsoft.Component.MSBuild', '-products', '*')

if (!$excludePrereleaseVS) {
$args += '-prerelease'
}

if (Get-Member -InputObject $vsRequirements -Name 'version') {
if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'version' -ErrorAction SilentlyContinue)) {
$args += '-version'
$args += $vsRequirements.version
}

if (Get-Member -InputObject $vsRequirements -Name 'components') {
if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'components' -ErrorAction SilentlyContinue)) {
foreach ($component in $vsRequirements.components) {
$args += '-requires'
$args += $component
Expand Down
6 changes: 3 additions & 3 deletions global.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"sdk": {
"version": "10.0.102-servicing.25612.111",
"version": "10.0.103-servicing.26070.104",
"paths": [
"builds/downloads/dotnet",
"$host$"
],
"errorMessage": "The .NET SDK could not be found, please run 'make dotnet -C builds'."
},
"tools": {
"dotnet": "10.0.102-servicing.25612.111"
"dotnet": "10.0.103-servicing.26070.104"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25612.111"
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26070.104"
}
}
Loading