From 3713e14e3227744340f04c0690f95b4f6229bdde Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 5 Dec 2025 02:02:30 +0000 Subject: [PATCH 1/2] Update dependencies from https://github.com/dotnet/arcade build 20251204.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.25577.1 -> To Version 8.0.0-beta.25604.1 --- NuGet.config | 1 - eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- eng/common/tools.ps1 | 16 +++++----------- global.json | 4 ++-- 5 files changed, 17 insertions(+), 24 deletions(-) diff --git a/NuGet.config b/NuGet.config index f8897051064e..58c979e8fa2c 100644 --- a/NuGet.config +++ b/NuGet.config @@ -11,7 +11,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c95f0bbf3040..247024c20351 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - 1be4bb105d0b2b0b9c9b36b8705eb6eb00250e42 + 73fd0fca28e08b5228968c48260e771f65c6229b - + https://github.com/dotnet/arcade - 1be4bb105d0b2b0b9c9b36b8705eb6eb00250e42 + 73fd0fca28e08b5228968c48260e771f65c6229b - + https://github.com/dotnet/arcade - 1be4bb105d0b2b0b9c9b36b8705eb6eb00250e42 + 73fd0fca28e08b5228968c48260e771f65c6229b - + https://github.com/dotnet/arcade - 1be4bb105d0b2b0b9c9b36b8705eb6eb00250e42 + 73fd0fca28e08b5228968c48260e771f65c6229b https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 870484aac1fd..70567e597e11 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -35,7 +35,7 @@ 8.0.0 4.0.0 8.0.1 - 8.0.0-beta.25577.1 + 8.0.0-beta.25604.1 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -212,7 +212,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.25577.1 + 8.0.0-beta.25604.1 4.18.4 1.3.2 8.0.0-beta.23607.1 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 0d6140e41e91..7e37345e6a87 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25577.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25577.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25604.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25604.1" } } From 8d74a9c4883f6f0b01f658afb4d3cc9a08523ac4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 7 Dec 2025 02:01:59 +0000 Subject: [PATCH 2/2] Update dependencies from https://github.com/dotnet/arcade build 20251205.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.25577.1 -> To Version 8.0.0-beta.25605.4 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- .../job/source-index-stage1.yml | 2 +- global.json | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 247024c20351..0bf4c3fb9e96 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - 73fd0fca28e08b5228968c48260e771f65c6229b + f922da012fe84ec4bd6e78ed483de7d6b9f2f564 - + https://github.com/dotnet/arcade - 73fd0fca28e08b5228968c48260e771f65c6229b + f922da012fe84ec4bd6e78ed483de7d6b9f2f564 - + https://github.com/dotnet/arcade - 73fd0fca28e08b5228968c48260e771f65c6229b + f922da012fe84ec4bd6e78ed483de7d6b9f2f564 - + https://github.com/dotnet/arcade - 73fd0fca28e08b5228968c48260e771f65c6229b + f922da012fe84ec4bd6e78ed483de7d6b9f2f564 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 70567e597e11..d7dd6d20df03 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -35,7 +35,7 @@ 8.0.0 4.0.0 8.0.1 - 8.0.0-beta.25604.1 + 8.0.0-beta.25605.4 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -212,7 +212,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.25604.1 + 8.0.0-beta.25605.4 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/eng/common/templates-official/job/source-index-stage1.yml b/eng/common/templates-official/job/source-index-stage1.yml index 0579e692fc81..8de0dfaf3494 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/global.json b/global.json index 7e37345e6a87..758ac1c57930 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25604.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25604.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25605.4", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25605.4" } }