From 711cb84836ee018eb991ee06e1499958f0c20195 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 12 Apr 2025 05:02:14 +0000 Subject: [PATCH 1/6] Update dependencies from https://github.com/dotnet/arcade build 20250411.7 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 10.0.0-beta.25210.1 -> To Version 10.0.0-beta.25211.7 --- eng/Version.Details.xml | 8 ++++---- .../core-templates/steps/install-microbuild.yml | 14 ++++++++++++-- eng/common/sdl/packages.config | 2 +- global.json | 8 ++++---- 4 files changed, 21 insertions(+), 11 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7ebe4afbfc2..931b6a6fded 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -31,13 +31,13 @@ - + https://github.com/dotnet/arcade - 490307dc9bb09caf016b2fa96005ac8aaa89c4e7 + 54d566f09138852983dd5d33fcf7317f5d3f3d1e - + https://github.com/dotnet/arcade - 490307dc9bb09caf016b2fa96005ac8aaa89c4e7 + 54d566f09138852983dd5d33fcf7317f5d3f3d1e https://github.com/dotnet/xharness diff --git a/eng/common/core-templates/steps/install-microbuild.yml b/eng/common/core-templates/steps/install-microbuild.yml index dba506e74c3..d0422085cb1 100644 --- a/eng/common/core-templates/steps/install-microbuild.yml +++ b/eng/common/core-templates/steps/install-microbuild.yml @@ -91,8 +91,18 @@ steps: script: | Write-Host "Copying Linux Path" $MBSIGN_APPFOLDER = '$(MBSIGN_APPFOLDER)' - $MBSIGN_APPFOLDER = $MBSIGN_APPFOLDER -replace '/build', '' - $MBSIGN_APPFOLDER = $MBSIGN_APPFOLDER + '/1.1.1032' + '/build' + $MBSIGN_APPFOLDER = ($MBSIGN_APPFOLDER -replace '/build', '') + + $versionRegex = '\d+\.\d+\.\d+' + $package = Get-ChildItem -Path $MBSIGN_APPFOLDER -Directory | + Where-Object { $_.Name -match $versionRegex } + + if ($package.Count -ne 1) { + Write-Host "There should be exactly one matching subfolder, but found $($package.Count)." + exit 1 + } + + $MBSIGN_APPFOLDER = $package[0].FullName + '/build' $MBSIGN_APPFOLDER | Write-Host $SignConfigPath = $MBSIGN_APPFOLDER + '/signconfig.xml' Copy-Item -Path "$(MBSIGN_APPFOLDER)/signconfig.xml" -Destination $SignConfigPath -Force diff --git a/eng/common/sdl/packages.config b/eng/common/sdl/packages.config index 4585cfd6bba..e5f543ea68c 100644 --- a/eng/common/sdl/packages.config +++ b/eng/common/sdl/packages.config @@ -1,4 +1,4 @@ - + diff --git a/global.json b/global.json index cecbd136e45..ed2c6a68f51 100644 --- a/global.json +++ b/global.json @@ -1,15 +1,15 @@ { "sdk": { - "version": "10.0.100-preview.3.25167.3", + "version": "10.0.100-preview.3.25201.16", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "10.0.100-preview.3.25167.3" + "dotnet": "10.0.100-preview.3.25201.16" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25210.1", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25210.1" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25211.7", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25211.7" }, "native-tools": { "python3": "3.7.1" From 1c56a578dc657d82b46c1512681fa7864e7f99d5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 13 Apr 2025 05:02:24 +0000 Subject: [PATCH 2/6] Update dependencies from https://github.com/dotnet/arcade build 20250412.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 10.0.0-beta.25210.1 -> To Version 10.0.0-beta.25212.1 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 931b6a6fded..e789eeb44da 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -31,13 +31,13 @@ - + https://github.com/dotnet/arcade - 54d566f09138852983dd5d33fcf7317f5d3f3d1e + 87401be5731aa537bbf4cb71d7800d1c74d5e429 - + https://github.com/dotnet/arcade - 54d566f09138852983dd5d33fcf7317f5d3f3d1e + 87401be5731aa537bbf4cb71d7800d1c74d5e429 https://github.com/dotnet/xharness diff --git a/global.json b/global.json index ed2c6a68f51..a6eabef5136 100644 --- a/global.json +++ b/global.json @@ -8,8 +8,8 @@ "dotnet": "10.0.100-preview.3.25201.16" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25211.7", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25211.7" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25212.1", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25212.1" }, "native-tools": { "python3": "3.7.1" From 1ab2cd59af1f4ea0de0c8bfd4965789bb6ae2f49 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 14 Apr 2025 05:02:29 +0000 Subject: [PATCH 3/6] Failed to perform coherency update for one or more dependencies. --- NuGet.config | 1 - 1 file changed, 1 deletion(-) diff --git a/NuGet.config b/NuGet.config index 7c53c1524c7..b3c68c8aa49 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,6 @@ - From ac13f62c8d2cb152e27b6631ace2d91738e63427 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 15 Apr 2025 05:01:27 +0000 Subject: [PATCH 4/6] Update dependencies from https://github.com/dotnet/arcade build 20250414.8 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 10.0.0-beta.25210.1 -> To Version 10.0.0-beta.25214.8 --- eng/Version.Details.xml | 8 ++++---- global.json | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e789eeb44da..001e8b01fc0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -31,13 +31,13 @@ - + https://github.com/dotnet/arcade - 87401be5731aa537bbf4cb71d7800d1c74d5e429 + 5af24911dd2de348e66143167d66d05eb55a9db6 - + https://github.com/dotnet/arcade - 87401be5731aa537bbf4cb71d7800d1c74d5e429 + 5af24911dd2de348e66143167d66d05eb55a9db6 https://github.com/dotnet/xharness diff --git a/global.json b/global.json index a6eabef5136..5781b0dfd3d 100644 --- a/global.json +++ b/global.json @@ -8,8 +8,8 @@ "dotnet": "10.0.100-preview.3.25201.16" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25212.1", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25212.1" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25214.8", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25214.8" }, "native-tools": { "python3": "3.7.1" From 7338122bdb7fb1586b0122bc024b57a0462afc9b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 16 Apr 2025 05:01:48 +0000 Subject: [PATCH 5/6] Update dependencies from https://github.com/dotnet/arcade build 20250415.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 10.0.0-beta.25210.1 -> To Version 10.0.0-beta.25215.5 --- eng/Version.Details.xml | 8 +++---- .../steps/install-microbuild.yml | 24 ------------------- eng/common/sdk-task.ps1 | 7 ++++-- eng/common/sdk-task.sh | 16 +++++++++++-- global.json | 4 ++-- 5 files changed, 25 insertions(+), 34 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 001e8b01fc0..237b767ed4b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -31,13 +31,13 @@ - + https://github.com/dotnet/arcade - 5af24911dd2de348e66143167d66d05eb55a9db6 + 1741844bd26eb13fc4731b1e9aed218686717fbd - + https://github.com/dotnet/arcade - 5af24911dd2de348e66143167d66d05eb55a9db6 + 1741844bd26eb13fc4731b1e9aed218686717fbd https://github.com/dotnet/xharness diff --git a/eng/common/core-templates/steps/install-microbuild.yml b/eng/common/core-templates/steps/install-microbuild.yml index d0422085cb1..2bcf974ee15 100644 --- a/eng/common/core-templates/steps/install-microbuild.yml +++ b/eng/common/core-templates/steps/install-microbuild.yml @@ -11,30 +11,6 @@ parameters: steps: - ${{ if eq(parameters.enableMicrobuild, 'true') }}: - ${{ if eq(parameters.enableMicrobuildForMacAndLinux, 'true') }}: - # Install Python 3.12.x on when Python > 3.12.x is installed - https://github.com/dotnet/source-build/issues/4802 - - script: | - version=$(python3 --version | awk '{print $2}') - major=$(echo $version | cut -d. -f1) - minor=$(echo $version | cut -d. -f2) - - installPython=false - if [ "$major" -gt 3 ] || { [ "$major" -eq 3 ] && [ "$minor" -gt 12 ]; }; then - installPython=true - fi - - echo "Python version: $version." - echo "Install Python 3.12.x: $installPython." - echo "##vso[task.setvariable variable=installPython;isOutput=true]$installPython" - name: InstallPython - displayName: 'Determine Python installation' - condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT')) - - - task: UsePythonVersion@0 - inputs: - versionSpec: '3.12.x' - displayName: 'Use Python 3.12.x' - condition: and(succeeded(), eq(variables['InstallPython.installPython'], 'true'), ne(variables['Agent.Os'], 'Windows_NT')) - # Needed to download the MicroBuild plugin nupkgs on Mac and Linux when nuget.exe is unavailable - task: UseDotNet@2 displayName: Install .NET 8.0 SDK for MicroBuild Plugin diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index ab2b13f63fb..a9d2a2d2699 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -6,12 +6,13 @@ Param( [string] $msbuildEngine = $null, [switch] $restore, [switch] $prepareMachine, + [switch][Alias('nobl')]$excludeCIBinaryLog, [switch] $help, [Parameter(ValueFromRemainingArguments=$true)][String[]]$properties ) $ci = $true -$binaryLog = $true +$binaryLog = if ($excludeCIBinaryLog) { $false } else { $true } $warnAsError = $true . $PSScriptRoot\tools.ps1 @@ -27,6 +28,7 @@ function Print-Usage() { Write-Host "Advanced settings:" Write-Host " -prepareMachine Prepare machine for CI run" Write-Host " -msbuildEngine Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)." + Write-Host " -excludeCIBinaryLog When running on CI, allow no binary log (short: -nobl)" Write-Host "" Write-Host "Command line arguments not listed above are passed thru to msbuild." } @@ -34,10 +36,11 @@ function Print-Usage() { function Build([string]$target) { $logSuffix = if ($target -eq 'Execute') { '' } else { ".$target" } $log = Join-Path $LogDir "$task$logSuffix.binlog" + $binaryLogArg = if ($binaryLog) { "/bl:$log" } else { "" } $outputPath = Join-Path $ToolsetDir "$task\" MSBuild $taskProject ` - /bl:$log ` + $binaryLogArg ` /t:$target ` /p:Configuration=$configuration ` /p:RepoRoot=$RepoRoot ` diff --git a/eng/common/sdk-task.sh b/eng/common/sdk-task.sh index b9b9e58db9a..2f83adc0269 100644 --- a/eng/common/sdk-task.sh +++ b/eng/common/sdk-task.sh @@ -7,6 +7,10 @@ show_usage() { echo " --verbosity Msbuild verbosity: q[uiet], m[inimal], n[ormal], d[etailed], and diag[nostic]" echo " --help Print help and exit" echo "" + + echo "Advanced settings:" + echo " --excludeCIBinarylog Don't output binary log (short: -nobl)" + echo "" echo "Command line arguments not listed above are passed thru to msbuild." } @@ -27,10 +31,12 @@ Build() { local log_suffix="" [[ "$target" != "Execute" ]] && log_suffix=".$target" local log="$log_dir/$task$log_suffix.binlog" + local binaryLogArg="" + [[ $binary_log == true ]] && binaryLogArg="/bl:$log" local output_path="$toolset_dir/$task/" MSBuild "$taskProject" \ - /bl:"$log" \ + $binaryLogArg \ /t:"$target" \ /p:Configuration="$configuration" \ /p:RepoRoot="$repo_root" \ @@ -39,8 +45,10 @@ Build() { $properties } +binary_log=true configuration="Debug" verbosity="minimal" +exclude_ci_binary_log=false restore=false help=false properties='' @@ -60,6 +68,11 @@ while (($# > 0)); do verbosity=$2 shift 2 ;; + --excludecibinarylog|--nobl) + binary_log=false + exclude_ci_binary_log=true + shift 1 + ;; --help) help=true shift 1 @@ -72,7 +85,6 @@ while (($# > 0)); do done ci=true -binaryLog=true warnAsError=true if $help; then diff --git a/global.json b/global.json index 5781b0dfd3d..c425174b948 100644 --- a/global.json +++ b/global.json @@ -8,8 +8,8 @@ "dotnet": "10.0.100-preview.3.25201.16" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25214.8", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25214.8" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25215.5", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25215.5" }, "native-tools": { "python3": "3.7.1" From 1eda65d5023e68ff6ae297f92ddf2870a42fcad0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 17 Apr 2025 05:01:49 +0000 Subject: [PATCH 6/6] Update dependencies from https://github.com/dotnet/arcade build 20250416.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk From Version 10.0.0-beta.25210.1 -> To Version 10.0.0-beta.25216.2 --- eng/Version.Details.xml | 8 ++++---- eng/common/core-templates/jobs/jobs.yml | 4 ++++ global.json | 4 ++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 237b767ed4b..88eb32885d3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -31,13 +31,13 @@ - + https://github.com/dotnet/arcade - 1741844bd26eb13fc4731b1e9aed218686717fbd + 85aaca76f75b109aa45b9e949f4a1c9047725d09 - + https://github.com/dotnet/arcade - 1741844bd26eb13fc4731b1e9aed218686717fbd + 85aaca76f75b109aa45b9e949f4a1c9047725d09 https://github.com/dotnet/xharness diff --git a/eng/common/core-templates/jobs/jobs.yml b/eng/common/core-templates/jobs/jobs.yml index 3d2deaa4a06..e653d19971c 100644 --- a/eng/common/core-templates/jobs/jobs.yml +++ b/eng/common/core-templates/jobs/jobs.yml @@ -27,6 +27,9 @@ parameters: # Optional: Publish the assets as soon as the publish to BAR stage is complete, rather doing so in a separate stage. publishAssetsImmediately: false + # Optional: 🌤️ or not the build has assets it wants to publish to BAR + isAssetlessBuild: false + # Optional: If using publishAssetsImmediately and additional parameters are needed, can be used to send along additional parameters (normally sent to post-build.yml) artifactsPublishingAdditionalParameters: '' signingValidationAdditionalParameters: '' @@ -110,6 +113,7 @@ jobs: runAsPublic: ${{ parameters.runAsPublic }} publishAssetsImmediately: ${{ parameters.publishAssetsImmediately }} + isAssetlessBuild: ${{ parameters.isAssetlessBuild }} enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }} diff --git a/global.json b/global.json index c425174b948..6d6d49fa059 100644 --- a/global.json +++ b/global.json @@ -8,8 +8,8 @@ "dotnet": "10.0.100-preview.3.25201.16" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25215.5", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25215.5" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25216.2", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25216.2" }, "native-tools": { "python3": "3.7.1"