[main] Update dependencies from dotnet/arcade (#348)

dotnet-maestro[bot] · web-flow · commit 94740b337150 · 2025-04-23T09:28:44.000+02:00
* Update dependencies from https://github.com/dotnet/arcade build 20250412.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.25206.1 -> To Version 10.0.0-beta.25212.1 * Update dependencies from https://github.com/dotnet/arcade build 20250416.2 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.25206.1 -> To Version 10.0.0-beta.25216.2 * Update dependencies from https://github.com/dotnet/arcade build 20250417.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.25206.1 -> To Version 10.0.0-beta.25217.1 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -9,14 +9,14 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25206.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25217.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>37f732fbfa006386f89a16be417278ea4fee375e</Sha>
+      <Sha>76dd1b4eb3b15881da350de93805ea6ab936364c</Sha>
     </Dependency>
     <!-- Intermediate is necessary for source build. -->
-    <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25206.1">
+    <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25217.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>37f732fbfa006386f89a16be417278ea4fee375e</Sha>
+      <Sha>76dd1b4eb3b15881da350de93805ea6ab936364c</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
   </ToolsetDependencies>
diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml
@@ -29,6 +29,9 @@ parameters:
 
   is1ESPipeline: ''
 
+  # Optional: 🌤️ or not the build has assets it wants to publish to BAR
+  isAssetlessBuild: false
+
 jobs:
 - job: Asset_Registry_Publish
 
@@ -72,14 +75,15 @@ jobs:
     - checkout: self
       fetchDepth: 3
       clean: true
-      
-    - task: DownloadPipelineArtifact@2
-      displayName: Download Asset Manifests
-      inputs:
-        artifactName: AssetManifests
-        targetPath: '$(Build.StagingDirectory)/AssetManifests'
-      condition: ${{ parameters.condition }}
-      continueOnError: ${{ parameters.continueOnError }}
+
+    - ${{ if eq(parameters.isAssetlessBuild, 'false') }}: 
+      - task: DownloadPipelineArtifact@2
+        displayName: Download Asset Manifests
+        inputs:
+          artifactName: AssetManifests
+          targetPath: '$(Build.StagingDirectory)/AssetManifests'
+        condition: ${{ parameters.condition }}
+        continueOnError: ${{ parameters.continueOnError }}
     
     - task: NuGetAuthenticate@1
 
@@ -92,6 +96,7 @@ jobs:
         scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1
         arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet
           /p:ManifestsPath='$(Build.StagingDirectory)/AssetManifests'
+          /p:IsAssetlessBuild=${{ parameters.isAssetlessBuild }}
           /p:MaestroApiEndpoint=https://maestro.dot.net
           /p:OfficialBuildId=$(Build.BuildNumber)
       condition: ${{ parameters.condition }}
@@ -124,7 +129,7 @@ jobs:
           publishLocation: Container
           artifactName: ReleaseConfigs
 
-    - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}:
+    - ${{ if or(eq(parameters.publishAssetsImmediately, 'true'), eq(parameters.isAssetlessBuild, 'true')) }}:
       - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
         parameters:
           BARBuildId: ${{ parameters.BARBuildId }}
@@ -145,6 +150,7 @@ jobs:
             -WaitPublishingFinish true
             -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
             -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
+            -SkipAssetsPublishing '${{ parameters.isAssetlessBuild }}'
 
     - ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}:
       - template: /eng/common/core-templates/steps/publish-logs.yml
diff --git 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/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml
@@ -60,6 +60,11 @@ parameters:
       artifactNames: ''
       downloadArtifacts: true
 
+  - name: isAssetlessBuild
+    type: boolean
+    displayName: Is Assetless Build
+    default: false
+
   # These parameters let the user customize the call to sdk-task.ps1 for publishing
   # symbols & general artifacts as well as for signing validation
   - name: symbolPublishingAdditionalParameters
@@ -320,3 +325,4 @@ stages:
               -RequireDefaultChannels ${{ parameters.requireDefaultChannels }}
               -ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
               -SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
+              -SkipAssetsPublishing '${{ parameters.isAssetlessBuild }}'
diff --git 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
@@ -91,8 +67,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/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1
@@ -6,7 +6,8 @@ param(
   [Parameter(Mandatory=$true)][string] $WaitPublishingFinish,
   [Parameter(Mandatory=$false)][string] $ArtifactsPublishingAdditionalParameters,
   [Parameter(Mandatory=$false)][string] $SymbolPublishingAdditionalParameters,
-  [Parameter(Mandatory=$false)][string] $RequireDefaultChannels
+  [Parameter(Mandatory=$false)][string] $RequireDefaultChannels,
+  [Parameter(Mandatory=$false)][string] $SkipAssetsPublishing
 )
 
 try {
@@ -39,6 +40,10 @@ try {
     $optionalParams.Add("--default-channels-required") | Out-Null
   }
 
+  if ("true" -eq $SkipAssetsPublishing) {
+    $optionalParams.Add("--skip-assets-publishing") | Out-Null
+  }
+
   & $darc add-build-to-channel `
     --id $buildId `
     --publishing-infra-version $PublishingInfraVersion `
diff --git 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,17 +28,19 @@ function Print-Usage() {
   Write-Host "Advanced settings:"
   Write-Host "  -prepareMachine         Prepare machine for CI run"
   Write-Host "  -msbuildEngine <value>  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."
 }
 
 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
@@ -7,6 +7,10 @@ show_usage() {
     echo "  --verbosity <value>      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/eng/common/sdl/packages.config b/eng/common/sdl/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Guardian.Cli" version="0.109.0"/>
+  <package id="Microsoft.Guardian.Cli" version="0.199.0"/>
 </packages>
diff --git a/global.json b/global.json
@@ -1,8 +1,8 @@
 {
   "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.25206.1"
+    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25217.1"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`{`
`2`	`2`	`"tools": {`
`3`		`- "dotnet": "10.0.100-preview.3.25167.3"`
	`3`	`+ "dotnet": "10.0.100-preview.3.25201.16"`
`4`	`4`	`},`
`5`	`5`	`"msbuild-sdks": {`
`6`		`- "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25206.1"`
	`6`	`+ "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25217.1"`
`7`	`7`	`}`
`8`	`8`	`}`