From 0e75dbc2292a5864b58d7435a5ba7c23ad321539 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 21 Nov 2025 02:02:07 +0000 Subject: [PATCH 1/2] Update dependencies from https://github.com/dotnet/arcade build 20251120.4 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25563.4 -> To Version 8.0.0-beta.25570.4 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- .../templates-official/job/source-build.yml | 2 +- eng/common/tools.ps1 | 16 +++++----------- global.json | 4 ++-- 5 files changed, 18 insertions(+), 24 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a285fa45b0cf..84ba3de1c607 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - 952abb7faea30d565b847d31411d019904a613a0 + b03a7214ed5a36d5267894adf9f8f55067962fdb - + https://github.com/dotnet/arcade - 952abb7faea30d565b847d31411d019904a613a0 + b03a7214ed5a36d5267894adf9f8f55067962fdb - + https://github.com/dotnet/arcade - 952abb7faea30d565b847d31411d019904a613a0 + b03a7214ed5a36d5267894adf9f8f55067962fdb - + https://github.com/dotnet/arcade - 952abb7faea30d565b847d31411d019904a613a0 + b03a7214ed5a36d5267894adf9f8f55067962fdb https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 323359c1f544..5ab732eb304a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ 7.0.0 4.0.0 7.0.0 - 8.0.0-beta.25563.4 + 8.0.0-beta.25570.4 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -214,7 +214,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.25563.4 + 8.0.0-beta.25570.4 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/eng/common/templates-official/job/source-build.yml b/eng/common/templates-official/job/source-build.yml index 7b9c58a90c5e..f75400757d1e 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/tools.ps1 b/eng/common/tools.ps1 index 6764bdedbf05..bb048ad125a8 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -296,7 +296,7 @@ function InstallDotNet([string] $dotnetRoot, if ($runtime -eq "aspnetcore") { $runtimePath = $runtimePath + "\Microsoft.AspNetCore.App" } if ($runtime -eq "windowsdesktop") { $runtimePath = $runtimePath + "\Microsoft.WindowsDesktop.App" } $runtimePath = $runtimePath + "\" + $version - + $dotnetVersionLabel = "runtime toolset '$runtime/$architecture v$version'" if (Test-Path $runtimePath) { @@ -545,25 +545,19 @@ function LocateVisualStudio([object]$vsRequirements = $null){ }) } - if (!$vsRequirements) { - if (Get-Member -InputObject $GlobalJson.tools -Name 'vs' -ErrorAction SilentlyContinue) { - $vsRequirements = $GlobalJson.tools.vs - } else { - $vsRequirements = $null - } - } + if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs } $args = @('-latest', '-format', 'json', '-requires', 'Microsoft.Component.MSBuild', '-products', '*') if (!$excludePrereleaseVS) { $args += '-prerelease' } - if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'version' -ErrorAction SilentlyContinue)) { + if (Get-Member -InputObject $vsRequirements -Name 'version') { $args += '-version' $args += $vsRequirements.version } - if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'components' -ErrorAction SilentlyContinue)) { + if (Get-Member -InputObject $vsRequirements -Name 'components') { foreach ($component in $vsRequirements.components) { $args += '-requires' $args += $component @@ -960,4 +954,4 @@ function Enable-Nuget-EnhancedRetry() { Write-PipelineSetVariable -Name 'NUGET_ENHANCED_NETWORK_RETRY_DELAY_MILLISECONDS' -Value '1000' Write-PipelineSetVariable -Name 'NUGET_RETRY_HTTP_429' -Value 'true' } -} \ No newline at end of file +} diff --git a/global.json b/global.json index 1f47b9c7583a..fd1b6223144e 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25563.4", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25563.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25570.4", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25570.4" } } From 38a9ccd784576776d52179ebe41ee2103bde05c8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 22 Nov 2025 02:01:57 +0000 Subject: [PATCH 2/2] Update dependencies from https://github.com/dotnet/arcade build 20251121.1 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25563.4 -> To Version 8.0.0-beta.25571.1 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- global.json | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 84ba3de1c607..a2dfc81b3a9d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - b03a7214ed5a36d5267894adf9f8f55067962fdb + be61e5dbdc68d586c5a479486c2342f0f4161c38 - + https://github.com/dotnet/arcade - b03a7214ed5a36d5267894adf9f8f55067962fdb + be61e5dbdc68d586c5a479486c2342f0f4161c38 - + https://github.com/dotnet/arcade - b03a7214ed5a36d5267894adf9f8f55067962fdb + be61e5dbdc68d586c5a479486c2342f0f4161c38 - + https://github.com/dotnet/arcade - b03a7214ed5a36d5267894adf9f8f55067962fdb + be61e5dbdc68d586c5a479486c2342f0f4161c38 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 5ab732eb304a..101f19963acd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ 7.0.0 4.0.0 7.0.0 - 8.0.0-beta.25570.4 + 8.0.0-beta.25571.1 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -214,7 +214,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.25570.4 + 8.0.0-beta.25571.1 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/global.json b/global.json index fd1b6223144e..80521423c003 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25570.4", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25570.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25571.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25571.1" } }