From 0a8f835d12ea48e9c3333924694f9366d6dbc04e Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 7 Nov 2025 02:05:55 +0000 Subject: [PATCH 1/2] Update dependencies from https://github.com/dotnet/arcade build 20251105.4 On relative base path root Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25515.2 -> To Version 9.0.0-beta.25555.4 --- eng/Version.Details.xml | 28 +++++++++---------- eng/Versions.props | 8 +++--- .../job/publish-build-assets.yml | 5 ++++ .../core-templates/post-build/post-build.yml | 5 ++++ global.json | 4 +-- 5 files changed, 30 insertions(+), 20 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fe0384df9a3c..9e5859680dfc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -555,34 +555,34 @@ - + https://github.com/dotnet/arcade - 6666973b629b24e259162dba03486c23af464bab + 9eaf7b289d5003a94ee23658f057a6c06ddcd570 - + https://github.com/dotnet/arcade - 6666973b629b24e259162dba03486c23af464bab + 9eaf7b289d5003a94ee23658f057a6c06ddcd570 - + https://github.com/dotnet/arcade - 6666973b629b24e259162dba03486c23af464bab + 9eaf7b289d5003a94ee23658f057a6c06ddcd570 - + https://github.com/dotnet/arcade - 6666973b629b24e259162dba03486c23af464bab + 9eaf7b289d5003a94ee23658f057a6c06ddcd570 - + https://github.com/dotnet/arcade - 6666973b629b24e259162dba03486c23af464bab + 9eaf7b289d5003a94ee23658f057a6c06ddcd570 - + https://github.com/dotnet/arcade - 6666973b629b24e259162dba03486c23af464bab + 9eaf7b289d5003a94ee23658f057a6c06ddcd570 - + https://github.com/dotnet/arcade - 6666973b629b24e259162dba03486c23af464bab + 9eaf7b289d5003a94ee23658f057a6c06ddcd570 diff --git a/eng/Versions.props b/eng/Versions.props index 227431499499..d10ec5bcd58e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -272,10 +272,10 @@ - 9.0.0-beta.25515.2 - 9.0.0-beta.25515.2 - 9.0.0-beta.25515.2 - 9.0.0-beta.25515.2 + 9.0.0-beta.25555.4 + 9.0.0-beta.25555.4 + 9.0.0-beta.25555.4 + 9.0.0-beta.25555.4 diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index a58c8a418e8a..6b5ff28cc706 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -145,6 +145,11 @@ jobs: PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }} is1ESPipeline: ${{ parameters.is1ESPipeline }} + # Darc is targeting 8.0, so make sure it's installed + - task: UseDotNet@2 + inputs: + version: 8.0.x + - task: AzureCLI@2 displayName: Publish Using Darc inputs: diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index 2ee8bbfff545..221d1ac6de19 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -305,6 +305,11 @@ stages: - task: NuGetAuthenticate@1 + # Darc is targeting 8.0, so make sure it's installed + - task: UseDotNet@2 + inputs: + version: 8.0.x + - task: AzureCLI@2 displayName: Publish Using Darc inputs: diff --git a/global.json b/global.json index 8d0dd39886de..4b1ad82235ff 100644 --- a/global.json +++ b/global.json @@ -17,8 +17,8 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25515.2", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25515.2", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25555.4", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25555.4", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1" } From 70825487e494fb6f4ca22cec1d38ca1670d0800b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 12 Nov 2025 02:02:52 +0000 Subject: [PATCH 2/2] Update dependencies from https://github.com/dotnet/arcade build 20251111.1 On relative base path root Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25515.2 -> To Version 9.0.0-beta.25561.1 --- eng/Version.Details.xml | 28 ++++++++++++++-------------- eng/Versions.props | 8 ++++---- eng/common/tools.ps1 | 16 +++++----------- global.json | 4 ++-- 4 files changed, 25 insertions(+), 31 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1f9b6e897385..5fcaf68932a6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -555,34 +555,34 @@ - + https://github.com/dotnet/arcade - 9eaf7b289d5003a94ee23658f057a6c06ddcd570 + bcc287603101fa751ff666f17b661c5e40fef60f - + https://github.com/dotnet/arcade - 9eaf7b289d5003a94ee23658f057a6c06ddcd570 + bcc287603101fa751ff666f17b661c5e40fef60f - + https://github.com/dotnet/arcade - 9eaf7b289d5003a94ee23658f057a6c06ddcd570 + bcc287603101fa751ff666f17b661c5e40fef60f - + https://github.com/dotnet/arcade - 9eaf7b289d5003a94ee23658f057a6c06ddcd570 + bcc287603101fa751ff666f17b661c5e40fef60f - + https://github.com/dotnet/arcade - 9eaf7b289d5003a94ee23658f057a6c06ddcd570 + bcc287603101fa751ff666f17b661c5e40fef60f - + https://github.com/dotnet/arcade - 9eaf7b289d5003a94ee23658f057a6c06ddcd570 + bcc287603101fa751ff666f17b661c5e40fef60f - + https://github.com/dotnet/arcade - 9eaf7b289d5003a94ee23658f057a6c06ddcd570 + bcc287603101fa751ff666f17b661c5e40fef60f diff --git a/eng/Versions.props b/eng/Versions.props index 56231243319e..c41e06bf5e99 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -272,10 +272,10 @@ - 9.0.0-beta.25555.4 - 9.0.0-beta.25555.4 - 9.0.0-beta.25555.4 - 9.0.0-beta.25555.4 + 9.0.0-beta.25561.1 + 9.0.0-beta.25561.1 + 9.0.0-beta.25561.1 + 9.0.0-beta.25561.1 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 01481d6e12cf..9b3ad8840fdb 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -295,7 +295,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) { @@ -547,25 +547,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 @@ -616,7 +610,7 @@ function InitializeBuildTool() { } else { $initializeBuildToolFramework=$env:_OverrideArcadeInitializeBuildToolFramework } - + $buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = $initializeBuildToolFramework } } elseif ($msbuildEngine -eq "vs") { try { diff --git a/global.json b/global.json index 4b1ad82235ff..f6484e480c28 100644 --- a/global.json +++ b/global.json @@ -17,8 +17,8 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25555.4", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25555.4", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25561.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25561.1", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1" }