From 2bbc151f90816a800b443067bb2c8d11d084b77c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 10 Dec 2025 18:00:38 +0000 Subject: [PATCH 1/4] Update dependencies from https://github.com/dotnet/arcade build 20251209.3 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25562.3 -> To Version 8.0.0-beta.25609.3 Microsoft.DotNet.XUnitConsoleRunner From Version 2.5.1-beta.25562.3 -> To Version 2.5.1-beta.25609.3 --- NuGet.config | 1 - eng/Version.Details.xml | 72 +++++++++---------- eng/Versions.props | 30 ++++---- .../templates-official/job/source-build.yml | 2 +- .../job/source-index-stage1.yml | 2 +- .../templates-official/steps/source-build.yml | 2 +- eng/common/templates/steps/source-build.yml | 2 +- global.json | 6 +- 8 files changed, 58 insertions(+), 59 deletions(-) diff --git a/NuGet.config b/NuGet.config index 8e91d49c71dab4..f6e25f4daf50d1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5801d6b9c49df6..a2bda60e0c0dc3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -111,9 +111,9 @@ - + https://github.com/dotnet/arcade - e8483fe03c7d3257c68f6013441da5d72eeb8392 + 2e7dcf4c838623b18c5497390c6ab2c48cd4d0b7 @@ -121,69 +121,69 @@ 73f0850939d96131c28cf6ea6ee5aacb4da0083a - + https://github.com/dotnet/arcade - e8483fe03c7d3257c68f6013441da5d72eeb8392 + 2e7dcf4c838623b18c5497390c6ab2c48cd4d0b7 - + https://github.com/dotnet/arcade - e8483fe03c7d3257c68f6013441da5d72eeb8392 + 2e7dcf4c838623b18c5497390c6ab2c48cd4d0b7 - + https://github.com/dotnet/arcade - e8483fe03c7d3257c68f6013441da5d72eeb8392 + 2e7dcf4c838623b18c5497390c6ab2c48cd4d0b7 - + https://github.com/dotnet/arcade - e8483fe03c7d3257c68f6013441da5d72eeb8392 + 2e7dcf4c838623b18c5497390c6ab2c48cd4d0b7 - + https://github.com/dotnet/arcade - e8483fe03c7d3257c68f6013441da5d72eeb8392 + 2e7dcf4c838623b18c5497390c6ab2c48cd4d0b7 - + https://github.com/dotnet/arcade - e8483fe03c7d3257c68f6013441da5d72eeb8392 + 2e7dcf4c838623b18c5497390c6ab2c48cd4d0b7 - + https://github.com/dotnet/arcade - e8483fe03c7d3257c68f6013441da5d72eeb8392 + 2e7dcf4c838623b18c5497390c6ab2c48cd4d0b7 - + https://github.com/dotnet/arcade - e8483fe03c7d3257c68f6013441da5d72eeb8392 + 2e7dcf4c838623b18c5497390c6ab2c48cd4d0b7 - + https://github.com/dotnet/arcade - e8483fe03c7d3257c68f6013441da5d72eeb8392 + 2e7dcf4c838623b18c5497390c6ab2c48cd4d0b7 - + https://github.com/dotnet/arcade - e8483fe03c7d3257c68f6013441da5d72eeb8392 + 2e7dcf4c838623b18c5497390c6ab2c48cd4d0b7 - + https://github.com/dotnet/arcade - e8483fe03c7d3257c68f6013441da5d72eeb8392 + 2e7dcf4c838623b18c5497390c6ab2c48cd4d0b7 - + https://github.com/dotnet/arcade - e8483fe03c7d3257c68f6013441da5d72eeb8392 + 2e7dcf4c838623b18c5497390c6ab2c48cd4d0b7 - + https://github.com/dotnet/arcade - e8483fe03c7d3257c68f6013441da5d72eeb8392 + 2e7dcf4c838623b18c5497390c6ab2c48cd4d0b7 - + https://github.com/dotnet/arcade - e8483fe03c7d3257c68f6013441da5d72eeb8392 + 2e7dcf4c838623b18c5497390c6ab2c48cd4d0b7 - + https://github.com/dotnet/arcade - e8483fe03c7d3257c68f6013441da5d72eeb8392 + 2e7dcf4c838623b18c5497390c6ab2c48cd4d0b7 - + https://github.com/dotnet/arcade - e8483fe03c7d3257c68f6013441da5d72eeb8392 + 2e7dcf4c838623b18c5497390c6ab2c48cd4d0b7 https://github.com/dotnet/runtime-assets @@ -334,9 +334,9 @@ https://github.com/dotnet/xharness 402df9c4f5abe6ee8519181dfb5481e04099fab0 - + https://github.com/dotnet/arcade - e8483fe03c7d3257c68f6013441da5d72eeb8392 + 2e7dcf4c838623b18c5497390c6ab2c48cd4d0b7 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 6e896fbe33b83c..6b655360d3a71a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -87,21 +87,21 @@ 8.0.100 - 8.0.0-beta.25562.3 - 8.0.0-beta.25562.3 - 8.0.0-beta.25562.3 - 8.0.0-beta.25562.3 - 8.0.0-beta.25562.3 - 2.5.1-beta.25562.3 - 8.0.0-beta.25562.3 - 8.0.0-beta.25562.3 - 8.0.0-beta.25562.3 - 8.0.0-beta.25562.3 - 8.0.0-beta.25562.3 - 8.0.0-beta.25562.3 - 8.0.0-beta.25562.3 - 8.0.0-beta.25562.3 - 8.0.0-beta.25562.3 + 8.0.0-beta.25609.3 + 8.0.0-beta.25609.3 + 8.0.0-beta.25609.3 + 8.0.0-beta.25609.3 + 8.0.0-beta.25609.3 + 2.5.1-beta.25609.3 + 8.0.0-beta.25609.3 + 8.0.0-beta.25609.3 + 8.0.0-beta.25609.3 + 8.0.0-beta.25609.3 + 8.0.0-beta.25609.3 + 8.0.0-beta.25609.3 + 8.0.0-beta.25609.3 + 8.0.0-beta.25609.3 + 8.0.0-beta.25609.3 6.0.0-preview.1.102 diff --git a/eng/common/templates-official/job/source-build.yml b/eng/common/templates-official/job/source-build.yml index 7b9c58a90c5ef7..f75400757d1ea5 100644 --- a/eng/common/templates-official/job/source-build.yml +++ b/eng/common/templates-official/job/source-build.yml @@ -61,7 +61,7 @@ jobs: ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] - image: 1es-mariner-2 + image: 1es-azurelinux-3 os: linux ${{ if ne(parameters.platform.pool, '') }}: diff --git a/eng/common/templates-official/job/source-index-stage1.yml b/eng/common/templates-official/job/source-index-stage1.yml index 0579e692fc8131..8de0dfaf349434 100644 --- a/eng/common/templates-official/job/source-index-stage1.yml +++ b/eng/common/templates-official/job/source-index-stage1.yml @@ -6,7 +6,7 @@ parameters: sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" preSteps: [] binlogPath: artifacts/log/Debug/Build.binlog - condition: '' + condition: eq(variables['Build.SourceBranch'], 'refs/heads/main') dependsOn: '' pool: '' diff --git a/eng/common/templates-official/steps/source-build.yml b/eng/common/templates-official/steps/source-build.yml index b63043da4b9f3f..c307825c91222f 100644 --- a/eng/common/templates-official/steps/source-build.yml +++ b/eng/common/templates-official/steps/source-build.yml @@ -47,7 +47,7 @@ steps: # in the default public locations. internalRuntimeDownloadArgs= if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then - internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://dotnetbuilds.blob.core.windows.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)' + internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://ci.dot.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)' fi buildConfig=Release diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index ae06b26ea37340..d08a0e92caa49e 100644 --- a/eng/common/templates/steps/source-build.yml +++ b/eng/common/templates/steps/source-build.yml @@ -47,7 +47,7 @@ steps: # in the default public locations. internalRuntimeDownloadArgs= if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then - internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://dotnetbuilds.blob.core.windows.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)' + internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://ci.dot.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)' fi buildConfig=Release diff --git a/global.json b/global.json index eea4c3f60c15b8..db727dc164f16b 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "8.0.122" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25562.3", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25562.3", - "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.25562.3", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25609.3", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25609.3", + "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.25609.3", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "8.0.0-rc.1.23406.6" From b68d4ad49ba7431863a5165c67bd09e747033086 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 15 Dec 2025 14:44:35 +0000 Subject: [PATCH 2/4] Update dependencies from https://github.com/dotnet/arcade build 20251211.2 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25562.3 -> To Version 8.0.0-beta.25611.2 Microsoft.DotNet.XUnitConsoleRunner From Version 2.5.1-beta.25562.3 -> To Version 2.5.1-beta.25611.2 --- eng/Version.Details.xml | 72 +++++++++---------- eng/Versions.props | 30 ++++---- eng/common/internal-feed-operations.ps1 | 2 +- eng/common/post-build/nuget-verification.ps1 | 2 +- eng/common/post-build/post-build-utils.ps1 | 10 +-- .../post-build/setup-maestro-vars.yml | 2 +- eng/common/tools.ps1 | 6 +- global.json | 6 +- 8 files changed, 65 insertions(+), 65 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a2bda60e0c0dc3..ff1c1e7fa77631 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -111,9 +111,9 @@ - + https://github.com/dotnet/arcade - 2e7dcf4c838623b18c5497390c6ab2c48cd4d0b7 + 4b01306353c43c151d713d152f48a4d523c41960 @@ -121,69 +121,69 @@ 73f0850939d96131c28cf6ea6ee5aacb4da0083a - + https://github.com/dotnet/arcade - 2e7dcf4c838623b18c5497390c6ab2c48cd4d0b7 + 4b01306353c43c151d713d152f48a4d523c41960 - + https://github.com/dotnet/arcade - 2e7dcf4c838623b18c5497390c6ab2c48cd4d0b7 + 4b01306353c43c151d713d152f48a4d523c41960 - + https://github.com/dotnet/arcade - 2e7dcf4c838623b18c5497390c6ab2c48cd4d0b7 + 4b01306353c43c151d713d152f48a4d523c41960 - + https://github.com/dotnet/arcade - 2e7dcf4c838623b18c5497390c6ab2c48cd4d0b7 + 4b01306353c43c151d713d152f48a4d523c41960 - + https://github.com/dotnet/arcade - 2e7dcf4c838623b18c5497390c6ab2c48cd4d0b7 + 4b01306353c43c151d713d152f48a4d523c41960 - + https://github.com/dotnet/arcade - 2e7dcf4c838623b18c5497390c6ab2c48cd4d0b7 + 4b01306353c43c151d713d152f48a4d523c41960 - + https://github.com/dotnet/arcade - 2e7dcf4c838623b18c5497390c6ab2c48cd4d0b7 + 4b01306353c43c151d713d152f48a4d523c41960 - + https://github.com/dotnet/arcade - 2e7dcf4c838623b18c5497390c6ab2c48cd4d0b7 + 4b01306353c43c151d713d152f48a4d523c41960 - + https://github.com/dotnet/arcade - 2e7dcf4c838623b18c5497390c6ab2c48cd4d0b7 + 4b01306353c43c151d713d152f48a4d523c41960 - + https://github.com/dotnet/arcade - 2e7dcf4c838623b18c5497390c6ab2c48cd4d0b7 + 4b01306353c43c151d713d152f48a4d523c41960 - + https://github.com/dotnet/arcade - 2e7dcf4c838623b18c5497390c6ab2c48cd4d0b7 + 4b01306353c43c151d713d152f48a4d523c41960 - + https://github.com/dotnet/arcade - 2e7dcf4c838623b18c5497390c6ab2c48cd4d0b7 + 4b01306353c43c151d713d152f48a4d523c41960 - + https://github.com/dotnet/arcade - 2e7dcf4c838623b18c5497390c6ab2c48cd4d0b7 + 4b01306353c43c151d713d152f48a4d523c41960 - + https://github.com/dotnet/arcade - 2e7dcf4c838623b18c5497390c6ab2c48cd4d0b7 + 4b01306353c43c151d713d152f48a4d523c41960 - + https://github.com/dotnet/arcade - 2e7dcf4c838623b18c5497390c6ab2c48cd4d0b7 + 4b01306353c43c151d713d152f48a4d523c41960 - + https://github.com/dotnet/arcade - 2e7dcf4c838623b18c5497390c6ab2c48cd4d0b7 + 4b01306353c43c151d713d152f48a4d523c41960 https://github.com/dotnet/runtime-assets @@ -334,9 +334,9 @@ https://github.com/dotnet/xharness 402df9c4f5abe6ee8519181dfb5481e04099fab0 - + https://github.com/dotnet/arcade - 2e7dcf4c838623b18c5497390c6ab2c48cd4d0b7 + 4b01306353c43c151d713d152f48a4d523c41960 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 6b655360d3a71a..dd30950777e3ec 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -87,21 +87,21 @@ 8.0.100 - 8.0.0-beta.25609.3 - 8.0.0-beta.25609.3 - 8.0.0-beta.25609.3 - 8.0.0-beta.25609.3 - 8.0.0-beta.25609.3 - 2.5.1-beta.25609.3 - 8.0.0-beta.25609.3 - 8.0.0-beta.25609.3 - 8.0.0-beta.25609.3 - 8.0.0-beta.25609.3 - 8.0.0-beta.25609.3 - 8.0.0-beta.25609.3 - 8.0.0-beta.25609.3 - 8.0.0-beta.25609.3 - 8.0.0-beta.25609.3 + 8.0.0-beta.25611.2 + 8.0.0-beta.25611.2 + 8.0.0-beta.25611.2 + 8.0.0-beta.25611.2 + 8.0.0-beta.25611.2 + 2.5.1-beta.25611.2 + 8.0.0-beta.25611.2 + 8.0.0-beta.25611.2 + 8.0.0-beta.25611.2 + 8.0.0-beta.25611.2 + 8.0.0-beta.25611.2 + 8.0.0-beta.25611.2 + 8.0.0-beta.25611.2 + 8.0.0-beta.25611.2 + 8.0.0-beta.25611.2 6.0.0-preview.1.102 diff --git a/eng/common/internal-feed-operations.ps1 b/eng/common/internal-feed-operations.ps1 index 92b77347d9904e..c282d3ae403a09 100644 --- a/eng/common/internal-feed-operations.ps1 +++ b/eng/common/internal-feed-operations.ps1 @@ -26,7 +26,7 @@ function SetupCredProvider { $url = 'https://raw.githubusercontent.com/microsoft/artifacts-credprovider/master/helpers/installcredprovider.ps1' Write-Host "Writing the contents of 'installcredprovider.ps1' locally..." - Invoke-WebRequest $url -OutFile installcredprovider.ps1 + Invoke-WebRequest $url -UseBasicParsing -OutFile installcredprovider.ps1 Write-Host 'Installing plugin...' .\installcredprovider.ps1 -Force diff --git a/eng/common/post-build/nuget-verification.ps1 b/eng/common/post-build/nuget-verification.ps1 index 8467dbf8e7c218..6cbbcafade26bf 100644 --- a/eng/common/post-build/nuget-verification.ps1 +++ b/eng/common/post-build/nuget-verification.ps1 @@ -65,7 +65,7 @@ if ($NuGetExePath) { Write-Host "Downloading nuget.exe from $nugetExeUrl..." $ProgressPreference = 'SilentlyContinue' try { - Invoke-WebRequest $nugetExeUrl -OutFile $downloadedNuGetExe + Invoke-WebRequest $nugetExeUrl -UseBasicParsing -OutFile $downloadedNuGetExe $ProgressPreference = 'Continue' } catch { $ProgressPreference = 'Continue' diff --git a/eng/common/post-build/post-build-utils.ps1 b/eng/common/post-build/post-build-utils.ps1 index 534f6988d5b7fd..83f9efb0b364d6 100644 --- a/eng/common/post-build/post-build-utils.ps1 +++ b/eng/common/post-build/post-build-utils.ps1 @@ -26,7 +26,7 @@ function Get-MaestroChannel([int]$ChannelId) { $apiHeaders = Create-MaestroApiRequestHeaders $apiEndpoint = "$MaestroApiEndPoint/api/channels/${ChannelId}?api-version=$MaestroApiVersion" - $result = try { Invoke-WebRequest -Method Get -Uri $apiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" } + $result = try { Invoke-WebRequest -UseBasicParsing -Method Get -Uri $apiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" } return $result } @@ -36,7 +36,7 @@ function Get-MaestroBuild([int]$BuildId) { $apiHeaders = Create-MaestroApiRequestHeaders -AuthToken $MaestroApiAccessToken $apiEndpoint = "$MaestroApiEndPoint/api/builds/${BuildId}?api-version=$MaestroApiVersion" - $result = try { return Invoke-WebRequest -Method Get -Uri $apiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" } + $result = try { return Invoke-WebRequest -UseBasicParsing -Method Get -Uri $apiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" } return $result } @@ -47,7 +47,7 @@ function Get-MaestroSubscriptions([string]$SourceRepository, [int]$ChannelId) { $apiHeaders = Create-MaestroApiRequestHeaders -AuthToken $MaestroApiAccessToken $apiEndpoint = "$MaestroApiEndPoint/api/subscriptions?sourceRepository=$SourceRepository&channelId=$ChannelId&api-version=$MaestroApiVersion" - $result = try { Invoke-WebRequest -Method Get -Uri $apiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" } + $result = try { Invoke-WebRequest -UseBasicParsing -Method Get -Uri $apiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" } return $result } @@ -56,7 +56,7 @@ function Assign-BuildToChannel([int]$BuildId, [int]$ChannelId) { $apiHeaders = Create-MaestroApiRequestHeaders -AuthToken $MaestroApiAccessToken $apiEndpoint = "$MaestroApiEndPoint/api/channels/${ChannelId}/builds/${BuildId}?api-version=$MaestroApiVersion" - Invoke-WebRequest -Method Post -Uri $apiEndpoint -Headers $apiHeaders | Out-Null + Invoke-WebRequest -UseBasicParsing -Method Post -Uri $apiEndpoint -Headers $apiHeaders | Out-Null } function Trigger-Subscription([string]$SubscriptionId) { @@ -64,7 +64,7 @@ function Trigger-Subscription([string]$SubscriptionId) { $apiHeaders = Create-MaestroApiRequestHeaders -AuthToken $MaestroApiAccessToken $apiEndpoint = "$MaestroApiEndPoint/api/subscriptions/$SubscriptionId/trigger?api-version=$MaestroApiVersion" - Invoke-WebRequest -Uri $apiEndpoint -Headers $apiHeaders -Method Post | Out-Null + Invoke-WebRequest -UseBasicParsing -Uri $apiEndpoint -Headers $apiHeaders -Method Post | Out-Null } function Validate-MaestroVars { diff --git a/eng/common/templates-official/post-build/setup-maestro-vars.yml b/eng/common/templates-official/post-build/setup-maestro-vars.yml index 0c87f149a4ad77..3a56abf8922ef3 100644 --- a/eng/common/templates-official/post-build/setup-maestro-vars.yml +++ b/eng/common/templates-official/post-build/setup-maestro-vars.yml @@ -37,7 +37,7 @@ steps: $apiHeaders.Add('Accept', 'application/json') $apiHeaders.Add('Authorization',"Bearer ${Env:MAESTRO_API_TOKEN}") - $buildInfo = try { Invoke-WebRequest -Method Get -Uri $buildApiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" } + $buildInfo = try { Invoke-WebRequest -UseBasicParsing -Method Get -Uri $buildApiEndpoint -Headers $apiHeaders | ConvertFrom-Json } catch { Write-Host "Error: $_" } $BarId = $Env:BARBuildId $Channels = $Env:PromoteToMaestroChannels -split "," diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index bb048ad125a8cf..b674a90618d76d 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -267,7 +267,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) { Retry({ Write-Host "GET $uri" - Invoke-WebRequest $uri -OutFile $installScript + Invoke-WebRequest $uri -UseBasicParsing -OutFile $installScript }) } @@ -501,7 +501,7 @@ function InitializeXCopyMSBuild([string]$packageVersion, [bool]$install) { Write-Host "Downloading $packageName $packageVersion" $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit Retry({ - Invoke-WebRequest "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/flat2/$packageName/$packageVersion/$packageName.$packageVersion.nupkg" -OutFile $packagePath + Invoke-WebRequest "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/flat2/$packageName/$packageVersion/$packageName.$packageVersion.nupkg" -UseBasicParsing -OutFile $packagePath }) Unzip $packagePath $packageDir @@ -541,7 +541,7 @@ function LocateVisualStudio([object]$vsRequirements = $null){ Create-Directory $vsWhereDir Write-Host 'Downloading vswhere' Retry({ - Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe + Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -UseBasicParsing -OutFile $vswhereExe }) } diff --git a/global.json b/global.json index db727dc164f16b..075a43ef4c3126 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "8.0.122" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25609.3", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25609.3", - "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.25609.3", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25611.2", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25611.2", + "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.25611.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "8.0.0-rc.1.23406.6" From fd926a4c53561e4ffa58fe0dcb1db2f2c54f1620 Mon Sep 17 00:00:00 2001 From: Ella Hathaway Date: Fri, 13 Feb 2026 16:04:56 +0000 Subject: [PATCH 3/4] Update arcade dependencies --- eng/Version.Details.xml | 72 +++++++++---------- eng/Versions.props | 30 ++++---- .../job/publish-build-assets.yml | 2 +- .../templates-official/job/source-build.yml | 2 +- .../job/source-index-stage1.yml | 2 +- .../post-build/post-build.yml | 2 +- eng/common/templates/job/execute-sdl.yml | 2 +- eng/common/templates/job/onelocbuild.yml | 2 +- .../templates/job/publish-build-assets.yml | 2 +- .../templates/job/source-index-stage1.yml | 4 +- .../templates/post-build/post-build.yml | 8 +-- .../templates/variables/pool-providers.yml | 2 +- eng/common/tools.ps1 | 13 +++- global.json | 10 +-- 14 files changed, 80 insertions(+), 73 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index aebe5d92b5fd27..c508582709b1e7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -111,9 +111,9 @@ - + https://github.com/dotnet/arcade - 4b01306353c43c151d713d152f48a4d523c41960 + 9751be9e9065b01a745e1b9e26bfe46ac55d5f82 @@ -121,69 +121,69 @@ 73f0850939d96131c28cf6ea6ee5aacb4da0083a - + https://github.com/dotnet/arcade - 4b01306353c43c151d713d152f48a4d523c41960 + 9751be9e9065b01a745e1b9e26bfe46ac55d5f82 - + https://github.com/dotnet/arcade - 4b01306353c43c151d713d152f48a4d523c41960 + 9751be9e9065b01a745e1b9e26bfe46ac55d5f82 - + https://github.com/dotnet/arcade - 4b01306353c43c151d713d152f48a4d523c41960 + 9751be9e9065b01a745e1b9e26bfe46ac55d5f82 - + https://github.com/dotnet/arcade - 4b01306353c43c151d713d152f48a4d523c41960 + 9751be9e9065b01a745e1b9e26bfe46ac55d5f82 - + https://github.com/dotnet/arcade - 4b01306353c43c151d713d152f48a4d523c41960 + 9751be9e9065b01a745e1b9e26bfe46ac55d5f82 - + https://github.com/dotnet/arcade - 4b01306353c43c151d713d152f48a4d523c41960 + 9751be9e9065b01a745e1b9e26bfe46ac55d5f82 - + https://github.com/dotnet/arcade - 4b01306353c43c151d713d152f48a4d523c41960 + 9751be9e9065b01a745e1b9e26bfe46ac55d5f82 - + https://github.com/dotnet/arcade - 4b01306353c43c151d713d152f48a4d523c41960 + 9751be9e9065b01a745e1b9e26bfe46ac55d5f82 - + https://github.com/dotnet/arcade - 4b01306353c43c151d713d152f48a4d523c41960 + 9751be9e9065b01a745e1b9e26bfe46ac55d5f82 - + https://github.com/dotnet/arcade - 4b01306353c43c151d713d152f48a4d523c41960 + 9751be9e9065b01a745e1b9e26bfe46ac55d5f82 - + https://github.com/dotnet/arcade - 4b01306353c43c151d713d152f48a4d523c41960 + 9751be9e9065b01a745e1b9e26bfe46ac55d5f82 - + https://github.com/dotnet/arcade - 4b01306353c43c151d713d152f48a4d523c41960 + 9751be9e9065b01a745e1b9e26bfe46ac55d5f82 - + https://github.com/dotnet/arcade - 4b01306353c43c151d713d152f48a4d523c41960 + 9751be9e9065b01a745e1b9e26bfe46ac55d5f82 - + https://github.com/dotnet/arcade - 4b01306353c43c151d713d152f48a4d523c41960 + 9751be9e9065b01a745e1b9e26bfe46ac55d5f82 - + https://github.com/dotnet/arcade - 4b01306353c43c151d713d152f48a4d523c41960 + 9751be9e9065b01a745e1b9e26bfe46ac55d5f82 - + https://github.com/dotnet/arcade - 4b01306353c43c151d713d152f48a4d523c41960 + 9751be9e9065b01a745e1b9e26bfe46ac55d5f82 https://github.com/dotnet/runtime-assets @@ -334,9 +334,9 @@ https://github.com/dotnet/xharness 402df9c4f5abe6ee8519181dfb5481e04099fab0 - + https://github.com/dotnet/arcade - 4b01306353c43c151d713d152f48a4d523c41960 + 9751be9e9065b01a745e1b9e26bfe46ac55d5f82 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 93dc48580d2149..cef3c46619fb4c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -87,21 +87,21 @@ 8.0.100 - 8.0.0-beta.25611.2 - 8.0.0-beta.25611.2 - 8.0.0-beta.25611.2 - 8.0.0-beta.25611.2 - 8.0.0-beta.25611.2 - 2.5.1-beta.25611.2 - 8.0.0-beta.25611.2 - 8.0.0-beta.25611.2 - 8.0.0-beta.25611.2 - 8.0.0-beta.25611.2 - 8.0.0-beta.25611.2 - 8.0.0-beta.25611.2 - 8.0.0-beta.25611.2 - 8.0.0-beta.25611.2 - 8.0.0-beta.25611.2 + 8.0.0-beta.26112.1 + 8.0.0-beta.26112.1 + 8.0.0-beta.26112.1 + 8.0.0-beta.26112.1 + 8.0.0-beta.26112.1 + 2.5.1-beta.26112.1 + 8.0.0-beta.26112.1 + 8.0.0-beta.26112.1 + 8.0.0-beta.26112.1 + 8.0.0-beta.26112.1 + 8.0.0-beta.26112.1 + 8.0.0-beta.26112.1 + 8.0.0-beta.26112.1 + 8.0.0-beta.26112.1 + 8.0.0-beta.26112.1 6.0.0-preview.1.102 diff --git a/eng/common/templates-official/job/publish-build-assets.yml b/eng/common/templates-official/job/publish-build-assets.yml index 53109246d94823..67a0de433a3dac 100644 --- a/eng/common/templates-official/job/publish-build-assets.yml +++ b/eng/common/templates-official/job/publish-build-assets.yml @@ -70,7 +70,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 and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: diff --git a/eng/common/templates-official/job/source-build.yml b/eng/common/templates-official/job/source-build.yml index f75400757d1ea5..5b118252903432 100644 --- a/eng/common/templates-official/job/source-build.yml +++ b/eng/common/templates-official/job/source-build.yml @@ -61,7 +61,7 @@ jobs: ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] - image: 1es-azurelinux-3 + image: build.azurelinux.3.amd64 os: linux ${{ if ne(parameters.platform.pool, '') }}: diff --git a/eng/common/templates-official/job/source-index-stage1.yml b/eng/common/templates-official/job/source-index-stage1.yml index 8de0dfaf349434..2f1304ede988d8 100644 --- a/eng/common/templates-official/job/source-index-stage1.yml +++ b/eng/common/templates-official/job/source-index-stage1.yml @@ -31,7 +31,7 @@ jobs: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: $(DncEngPublicBuildPool) - demands: ImageOverride -equals windows.vs2019.amd64.open + demands: ImageOverride -equals windows.vs2022.amd64.open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $(DncEngInternalBuildPool) image: windows.vs2022.amd64 diff --git a/eng/common/templates-official/post-build/post-build.yml b/eng/common/templates-official/post-build/post-build.yml index 07837055ee3066..8b6f0cd8a43c02 100644 --- a/eng/common/templates-official/post-build/post-build.yml +++ b/eng/common/templates-official/post-build/post-build.yml @@ -261,7 +261,7 @@ stages: # If it's not devdiv, it's dnceng ${{ else }}: name: NetCore1ESPool-Publishing-Internal - image: windows.vs2019.amd64 + image: windows.vs2022.amd64 os: windows steps: - template: setup-maestro-vars.yml diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index 7870f93bc17652..28ccaaa482064e 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -55,7 +55,7 @@ jobs: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2019.amd64 + demands: ImageOverride -equals windows.vs2022.amd64 steps: - checkout: self clean: true diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml index 2cd3840c992720..0d9a54751c81af 100644 --- a/eng/common/templates/job/onelocbuild.yml +++ b/eng/common/templates/job/onelocbuild.yml @@ -54,7 +54,7 @@ jobs: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2019.amd64 + demands: ImageOverride -equals windows.vs2022.amd64 steps: - ${{ if ne(parameters.SkipLocProjectJsonGeneration, 'true') }}: diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index b4ece772c32660..9234ccab1a45d6 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -68,7 +68,7 @@ jobs: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Publishing-Internal - demands: ImageOverride -equals windows.vs2019.amd64 + demands: ImageOverride -equals windows.vs2022.amd64 steps: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index 81606fd9a541e6..1975582b9b053b 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -31,10 +31,10 @@ jobs: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: $(DncEngPublicBuildPool) - demands: ImageOverride -equals windows.vs2019.amd64.open + demands: ImageOverride -equals windows.vs2022.amd64.open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2019.amd64 + demands: ImageOverride -equals windows.vs2022.amd64 steps: - ${{ each preStep in parameters.preSteps }}: diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 96ca0688238491..db4bf92b90b928 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -108,7 +108,7 @@ stages: # If it's not devdiv, it's dnceng ${{ else }}: name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2019.amd64 + demands: ImageOverride -equals windows.vs2022.amd64 steps: - template: setup-maestro-vars.yml @@ -144,7 +144,7 @@ stages: # If it's not devdiv, it's dnceng ${{ else }}: name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2019.amd64 + demands: ImageOverride -equals windows.vs2022.amd64 steps: - template: setup-maestro-vars.yml parameters: @@ -198,7 +198,7 @@ stages: # If it's not devdiv, it's dnceng ${{ else }}: name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2019.amd64 + demands: ImageOverride -equals windows.vs2022.amd64 steps: - template: setup-maestro-vars.yml parameters: @@ -258,7 +258,7 @@ stages: # If it's not devdiv, it's dnceng ${{ else }}: name: NetCore1ESPool-Publishing-Internal - demands: ImageOverride -equals windows.vs2019.amd64 + demands: ImageOverride -equals windows.vs2022.amd64 steps: - template: setup-maestro-vars.yml parameters: diff --git a/eng/common/templates/variables/pool-providers.yml b/eng/common/templates/variables/pool-providers.yml index d236f9fdbb153b..00a41b0d2a6fa9 100644 --- a/eng/common/templates/variables/pool-providers.yml +++ b/eng/common/templates/variables/pool-providers.yml @@ -23,7 +23,7 @@ # # pool: # name: $(DncEngInternalBuildPool) -# demands: ImageOverride -equals windows.vs2019.amd64 +# demands: ImageOverride -equals windows.vs2022.amd64 variables: # Coalesce the target and source branches so we know when a PR targets a release branch diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index b674a90618d76d..0acf27aa3aaeba 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -545,19 +545,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 diff --git a/global.json b/global.json index 075a43ef4c3126..49b4f3c261fcb1 100644 --- a/global.json +++ b/global.json @@ -1,16 +1,16 @@ { "sdk": { - "version": "8.0.122", + "version": "8.0.123", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "8.0.122" + "dotnet": "8.0.123" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25611.2", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25611.2", - "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.25611.2", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.26112.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.26112.1", + "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.26112.1", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "8.0.0-rc.1.23406.6" From 83f851218e088f450ef34f9739205e6a01a23c33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Wed, 18 Feb 2026 10:24:22 +0100 Subject: [PATCH 4/4] Port dynamic workload sdk version lookup from https://github.com/dotnet/runtime/pull/121429 --- eng/Versions.props | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 396d2c9f264b7d..fcbb42b58510e8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,6 @@ release -$(PreReleaseVersionLabel) -$(PreReleaseVersionLabel).$(PreReleaseVersionIteration) - $(SdkBandVersion)$(WorkloadVersionSuffix) false 8.0.25 $(MicrosoftNETWorkloadEmscriptenCurrentManifest80100Version) + + + <_GlobalJsonContent>$([System.IO.File]::ReadAllText('$([MSBuild]::GetPathOfFileAbove('global.json', '$(MSBuildThisFileDirectory)'))')) + <_GlobalJsonSdkVersion Condition="'$(_GlobalJsonContent)' != ''">$([System.Text.RegularExpressions.Regex]::Match($(_GlobalJsonContent), '"sdk"\s*:\s*\{[^\}]*"version"\s*:\s*"([^"]+)"', System.Text.RegularExpressions.RegexOptions.Singleline).Groups[1].Value) + <_DotnetSdkVersion>$(MicrosoftDotNetApiCompatTaskVersion) + $(_DotnetSdkVersion) + $(_GlobalJsonSdkVersion) + $(SdkBandVersion)$(WorkloadVersionSuffix) 1.1.87-gba258badda @@ -270,9 +281,6 @@ 3.1.7 1.0.406601 - - 8.0.122 - $(MicrosoftDotnetSdkInternalVersion)