Skip to content

Commit ef414bf

Browse files
dotnet-maestro[bot]nohwnd
dotnet-maestro[bot]
and
nohwnd
authored
[main] Update dependencies from dotnet/arcade (#15264)
* Update dependencies from https://github.com/dotnet/arcade build 20250815.5 Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.25408.3 -> To Version 10.0.0-beta.25415.5 * Update dependencies from https://github.com/dotnet/arcade build 20250822.3 Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.25408.3 -> To Version 10.0.0-beta.25422.3 * Update dependencies from https://github.com/dotnet/arcade build 20250830.1 Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.25408.3 -> To Version 10.0.0-beta.25430.1 * Update dependencies from https://github.com/dotnet/arcade build 20250907.1 Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.25408.3 -> To Version 11.0.0-beta.25457.1 * Update dependencies from https://github.com/dotnet/arcade build 20250912.2 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.25408.3 -> To Version 11.0.0-beta.25462.2 * Update dependencies from https://github.com/dotnet/arcade build 20250919.3 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.25408.3 -> To Version 11.0.0-beta.25469.3 * Update dependencies from https://github.com/dotnet/arcade build 20250927.2 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.25408.3 -> To Version 11.0.0-beta.25477.2 * fix slnx * Update dependencies from https://github.com/dotnet/arcade build 20251004.3 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.25408.3 -> To Version 11.0.0-beta.25504.3 * Update dependencies from https://github.com/dotnet/arcade build 20251009.1 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.25408.3 -> To Version 11.0.0-beta.25509.1 * Update dependencies from https://github.com/dotnet/arcade build 20251024.1 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.25408.3 -> To Version 11.0.0-beta.25524.1 * Update dependencies from https://github.com/dotnet/arcade build 20251031.1 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.25408.3 -> To Version 11.0.0-beta.25531.1 * Update dependencies from https://github.com/dotnet/arcade build 20251107.2 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.25408.3 -> To Version 11.0.0-beta.25557.2 * Update images * DOTNET_HOST_PATH fix * Call the correct script * Add dotnet_root * Update dependencies from https://github.com/dotnet/arcade build 20251110.1 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.25408.3 -> To Version 11.0.0-beta.25560.1 * Update dependencies from https://github.com/dotnet/arcade build 20251112.6 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.25408.3 -> To Version 11.0.0-beta.25562.6 * Update global.json * tl:off * Update dependencies from https://github.com/dotnet/arcade build 20251121.8 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.25408.3 -> To Version 11.0.0-beta.25571.8 * Add property to show versioninfo that we check --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Jakub Jareš <me@jakubjares.com>
1 parent 154e8ba commit ef414bf

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+714
-452
lines changed

‎azure-pipelines-official.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ extends:
127127
enabled: true
128128
pool:
129129
name: $(DncEngInternalBuildPool)
130-
image: windows.vs2022preview.amd64
130+
image: windows.vs2026preview.scout.amd64
131131
os: windows
132132
settings:
133133
networkIsolationPolicy: Permissive,CFSClean
@@ -153,7 +153,7 @@ extends:
153153
timeoutInMinutes: 120
154154
pool:
155155
name: $(DncEngInternalBuildPool)
156-
image: windows.vs2022preview.amd64
156+
image: windows.vs2026preview.scout.amd64
157157
os: windows
158158
steps:
159159
# This steps help to understand versions of .NET runtime installed on the machine,
@@ -187,6 +187,8 @@ extends:
187187
-performanceTest
188188
name: Test
189189
displayName: Test
190+
env:
191+
DOTNET_ROOT: $(Build.SourcesDirectory)/.dotnet
190192

191193
# This step is only helpful for diagnosing some issues with vstest/test host that would not appear
192194
# through the console or trx
@@ -257,7 +259,7 @@ extends:
257259
- ${{ pool.os }}
258260
pool:
259261
name: $(DncEngInternalBuildPool)
260-
image: windows.vs2022preview.amd64
262+
image: windows.vs2026preview.scout.amd64
261263
os: windows
262264
steps:
263265
# The template job needs a log, otherwise it writes a warning. We can disable log uploading only for

‎azure-pipelines.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ stages:
8181
timeoutInMinutes: 120
8282
pool:
8383
name: NetCore-Public
84-
demands: ImageOverride -equals windows.vs2022preview.amd64.open
84+
demands: ImageOverride -equals windows.vs2026preview.scout.amd64.open
8585
strategy:
8686
matrix:
8787
Release:
@@ -115,6 +115,8 @@ stages:
115115
/bl:$(Build.SourcesDirectory)/artifacts/TestResults/$(_BuildConfig)/Test.binlog
116116
name: Test
117117
displayName: Test
118+
env:
119+
DOTNET_ROOT: $(Build.SourcesDirectory)/.dotnet
118120

119121
# This step is only helpful for diagnosing some issues with vstest/test host that would not appear
120122
# through the console or trx

‎build.cmd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
@echo off
2-
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0eng\common\Build.ps1""" -restore -build %*"
2+
powershell -ExecutionPolicy ByPass -NoProfile -command "& """%~dp0eng\Build.ps1""" -restore -build %*"
33
exit /b %ErrorLevel%

‎eng/Version.Details.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ This file should be imported by eng/Versions.props
1414
<!-- dotnet/core-setup dependencies -->
1515
<MicrosoftExtensionsFileSystemGlobbingPackageVersion>2.0.0</MicrosoftExtensionsFileSystemGlobbingPackageVersion>
1616
<!-- dotnet/arcade dependencies -->
17-
<MicrosoftDotNetArcadeSdkPackageVersion>10.0.0-beta.25408.3</MicrosoftDotNetArcadeSdkPackageVersion>
17+
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25571.8</MicrosoftDotNetArcadeSdkPackageVersion>
1818
<!-- dotnet/symreader-converter dependencies -->
1919
<MicrosoftDiaSymReaderConverterPackageVersion>1.1.0-beta2-19575-01</MicrosoftDiaSymReaderConverterPackageVersion>
2020
<MicrosoftDiaSymReaderPdb2PdbPackageVersion>1.1.0-beta2-19575-01</MicrosoftDiaSymReaderPdb2PdbPackageVersion>

‎eng/Version.Details.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
</Dependency>
2323
</ProductDependencies>
2424
<ToolsetDependencies>
25-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25408.3">
25+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25571.8">
2626
<Uri>https://github.com/dotnet/arcade</Uri>
27-
<Sha>d27184f7cb92b4abb4b20e91ecb5c43bc43de65b</Sha>
27+
<Sha>a8b9e73f56e84dcb4c7ed0f23f79b308b4f83a01</Sha>
2828
</Dependency>
2929
<Dependency Name="Microsoft.DiaSymReader.Pdb2Pdb" Version="1.1.0-beta2-19575-01">
3030
<Uri>https://github.com/dotnet/symreader-converter</Uri>

‎eng/build.ps1‎

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
[CmdletBinding(PositionalBinding=$false)]
2+
Param(
3+
[string][Alias('c')]$configuration = "Debug",
4+
[string]$platform = $null,
5+
[string] $projects,
6+
[string][Alias('v')]$verbosity = "minimal",
7+
[string] $msbuildEngine = $null,
8+
[bool] $warnAsError = $true,
9+
[bool] $nodeReuse = $true,
10+
[switch] $buildCheck = $false,
11+
[switch][Alias('r')]$restore,
12+
[switch] $deployDeps,
13+
[switch][Alias('b')]$build,
14+
[switch] $rebuild,
15+
[switch] $deploy,
16+
[switch][Alias('t')]$test,
17+
[switch] $integrationTest,
18+
[switch] $performanceTest,
19+
[switch] $sign,
20+
[switch] $pack,
21+
[switch] $publish,
22+
[switch] $clean,
23+
[switch][Alias('pb')]$productBuild,
24+
[switch]$fromVMR,
25+
[switch][Alias('bl')]$binaryLog,
26+
[switch][Alias('nobl')]$excludeCIBinarylog,
27+
[switch] $ci,
28+
[switch] $prepareMachine,
29+
[string] $runtimeSourceFeed = '',
30+
[string] $runtimeSourceFeedKey = '',
31+
[switch] $excludePrereleaseVS,
32+
[switch] $nativeToolsOnMachine,
33+
[switch] $help,
34+
[Parameter(ValueFromRemainingArguments=$true)][String[]]$properties
35+
)
36+
37+
# Workaround for DOTNET_HOST_PATH not being set by older MSBuild
38+
if (-not $env:DOTNET_HOST_PATH) {
39+
$env:DOTNET_HOST_PATH = [System.IO.Path]::GetFullPath((Join-Path (Join-Path (Join-Path $PSScriptRoot '..') '.dotnet') 'dotnet'))
40+
if (-not (Test-Path $env:DOTNET_HOST_PATH)) {
41+
$env:DOTNET_HOST_PATH = "$($env:DOTNET_HOST_PATH).exe"
42+
}
43+
}
44+
45+
& $PSScriptRoot/common/build.ps1 @PSBoundParameters

‎eng/common/SetupNugetSources.ps1‎

Lines changed: 41 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
# See example call for this script below.
88
#
99
# - task: PowerShell@2
10-
# displayName: Setup Private Feeds Credentials
10+
# displayName: Setup internal Feeds Credentials
1111
# condition: eq(variables['Agent.OS'], 'Windows_NT')
1212
# inputs:
13-
# filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
14-
# arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
13+
# filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1
14+
# arguments: -ConfigFile $(System.DefaultWorkingDirectory)/NuGet.config -Password $Env:Token
1515
# env:
1616
# Token: $(dn-bot-dnceng-artifact-feeds-rw)
1717
#
@@ -34,19 +34,28 @@ Set-StrictMode -Version 2.0
3434

3535
. $PSScriptRoot\tools.ps1
3636

37+
# Adds or enables the package source with the given name
38+
function AddOrEnablePackageSource($sources, $disabledPackageSources, $SourceName, $SourceEndPoint, $creds, $Username, $pwd) {
39+
if ($disabledPackageSources -eq $null -or -not (EnableInternalPackageSource -DisabledPackageSources $disabledPackageSources -Creds $creds -PackageSourceName $SourceName)) {
40+
AddPackageSource -Sources $sources -SourceName $SourceName -SourceEndPoint $SourceEndPoint -Creds $creds -Username $userName -pwd $Password
41+
}
42+
}
43+
3744
# Add source entry to PackageSources
3845
function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $pwd) {
3946
$packageSource = $sources.SelectSingleNode("add[@key='$SourceName']")
4047

4148
if ($packageSource -eq $null)
4249
{
50+
Write-Host "Adding package source $SourceName"
51+
4352
$packageSource = $doc.CreateElement("add")
4453
$packageSource.SetAttribute("key", $SourceName)
4554
$packageSource.SetAttribute("value", $SourceEndPoint)
4655
$sources.AppendChild($packageSource) | Out-Null
4756
}
4857
else {
49-
Write-Host "Package source $SourceName already present."
58+
Write-Host "Package source $SourceName already present and enabled."
5059
}
5160

5261
AddCredential -Creds $creds -Source $SourceName -Username $Username -pwd $pwd
@@ -59,6 +68,8 @@ function AddCredential($creds, $source, $username, $pwd) {
5968
return;
6069
}
6170

71+
Write-Host "Inserting credential for feed: " $source
72+
6273
# Looks for credential configuration for the given SourceName. Create it if none is found.
6374
$sourceElement = $creds.SelectSingleNode($Source)
6475
if ($sourceElement -eq $null)
@@ -91,24 +102,27 @@ function AddCredential($creds, $source, $username, $pwd) {
91102
$passwordElement.SetAttribute("value", $pwd)
92103
}
93104

94-
function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $pwd) {
95-
$maestroPrivateSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]")
96-
97-
Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds."
98-
99-
ForEach ($PackageSource in $maestroPrivateSources) {
100-
Write-Host "`tInserting credential for Maestro's feed:" $PackageSource.Key
101-
AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -pwd $pwd
105+
# Enable all darc-int package sources.
106+
function EnableMaestroInternalPackageSources($DisabledPackageSources, $Creds) {
107+
$maestroInternalSources = $DisabledPackageSources.SelectNodes("add[contains(@key,'darc-int')]")
108+
ForEach ($DisabledPackageSource in $maestroInternalSources) {
109+
EnableInternalPackageSource -DisabledPackageSources $DisabledPackageSources -Creds $Creds -PackageSourceName $DisabledPackageSource.key
102110
}
103111
}
104112

105-
function EnablePrivatePackageSources($DisabledPackageSources) {
106-
$maestroPrivateSources = $DisabledPackageSources.SelectNodes("add[contains(@key,'darc-int')]")
107-
ForEach ($DisabledPackageSource in $maestroPrivateSources) {
108-
Write-Host "`tEnsuring private source '$($DisabledPackageSource.key)' is enabled by deleting it from disabledPackageSource"
113+
# Enables an internal package source by name, if found. Returns true if the package source was found and enabled, false otherwise.
114+
function EnableInternalPackageSource($DisabledPackageSources, $Creds, $PackageSourceName) {
115+
$DisabledPackageSource = $DisabledPackageSources.SelectSingleNode("add[@key='$PackageSourceName']")
116+
if ($DisabledPackageSource) {
117+
Write-Host "Enabling internal source '$($DisabledPackageSource.key)'."
118+
109119
# Due to https://github.com/NuGet/Home/issues/10291, we must actually remove the disabled entries
110120
$DisabledPackageSources.RemoveChild($DisabledPackageSource)
121+
122+
AddCredential -Creds $creds -Source $DisabledPackageSource.Key -Username $userName -pwd $Password
123+
return $true
111124
}
125+
return $false
112126
}
113127

114128
if (!(Test-Path $ConfigFile -PathType Leaf)) {
@@ -121,15 +135,17 @@ $doc = New-Object System.Xml.XmlDocument
121135
$filename = (Get-Item $ConfigFile).FullName
122136
$doc.Load($filename)
123137

124-
# Get reference to <PackageSources> or create one if none exist already
138+
# Get reference to <PackageSources> - fail if none exist
125139
$sources = $doc.DocumentElement.SelectSingleNode("packageSources")
126140
if ($sources -eq $null) {
127-
$sources = $doc.CreateElement("packageSources")
128-
$doc.DocumentElement.AppendChild($sources) | Out-Null
141+
Write-PipelineTelemetryError -Category 'Build' -Message "Eng/common/SetupNugetSources.ps1 returned a non-zero exit code. NuGet config file must contain a packageSources section: $ConfigFile"
142+
ExitWithExitCode 1
129143
}
130144

131145
$creds = $null
146+
$feedSuffix = "v3/index.json"
132147
if ($Password) {
148+
$feedSuffix = "v2"
133149
# Looks for a <PackageSourceCredentials> node. Create it if none is found.
134150
$creds = $doc.DocumentElement.SelectSingleNode("packageSourceCredentials")
135151
if ($creds -eq $null) {
@@ -138,33 +154,22 @@ if ($Password) {
138154
}
139155
}
140156

157+
$userName = "dn-bot"
158+
141159
# Check for disabledPackageSources; we'll enable any darc-int ones we find there
142160
$disabledSources = $doc.DocumentElement.SelectSingleNode("disabledPackageSources")
143161
if ($disabledSources -ne $null) {
144162
Write-Host "Checking for any darc-int disabled package sources in the disabledPackageSources node"
145-
EnablePrivatePackageSources -DisabledPackageSources $disabledSources
146-
}
147-
148-
$userName = "dn-bot"
149-
150-
# Insert credential nodes for Maestro's private feeds
151-
InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -pwd $Password
152-
153-
# 3.1 uses a different feed url format so it's handled differently here
154-
$dotnet31Source = $sources.SelectSingleNode("add[@key='dotnet3.1']")
155-
if ($dotnet31Source -ne $null) {
156-
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password
157-
AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password
163+
EnableMaestroInternalPackageSources -DisabledPackageSources $disabledSources -Creds $creds
158164
}
159-
160-
$dotnetVersions = @('5','6','7','8','9')
165+
$dotnetVersions = @('5','6','7','8','9','10')
161166

162167
foreach ($dotnetVersion in $dotnetVersions) {
163168
$feedPrefix = "dotnet" + $dotnetVersion;
164169
$dotnetSource = $sources.SelectSingleNode("add[@key='$feedPrefix']")
165170
if ($dotnetSource -ne $null) {
166-
AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password
167-
AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password
171+
AddOrEnablePackageSource -Sources $sources -DisabledPackageSources $disabledSources -SourceName "$feedPrefix-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal/nuget/$feedSuffix" -Creds $creds -Username $userName -pwd $Password
172+
AddOrEnablePackageSource -Sources $sources -DisabledPackageSources $disabledSources -SourceName "$feedPrefix-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal-transport/nuget/$feedSuffix" -Creds $creds -Username $userName -pwd $Password
168173
}
169174
}
170175

0 commit comments

Comments
 (0)