From 959f477e31e748740b9d5d2ce014b1c691edd53c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 9 Apr 2025 21:31:55 +0000 Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade build 20250409.3 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.XliffTasks From Version 10.0.0-beta.25207.4 -> To Version 10.0.0-beta.25209.3 --- eng/Version.Details.xml | 32 +++++++++---------- eng/Versions.props | 8 ++--- .../job/publish-build-assets.yml | 24 ++++++++------ .../core-templates/post-build/post-build.yml | 6 ++++ eng/common/post-build/publish-using-darc.ps1 | 7 +++- global.json | 4 +-- 6 files changed, 49 insertions(+), 32 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9599f228b8..f846987596 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -235,38 +235,38 @@ https://github.com/dotnet/llvm-project bcbadea190f4548a30eb43d770f34af321e2cc8e - + https://github.com/dotnet/arcade - 6bcab7722ffc02d9a9f64e736d06bb4e4a04a94b + 03b4b258fc72e5663f2ad701df5d70129aa2df8a - + https://github.com/dotnet/arcade - 6bcab7722ffc02d9a9f64e736d06bb4e4a04a94b + 03b4b258fc72e5663f2ad701df5d70129aa2df8a - + https://github.com/dotnet/arcade - 6bcab7722ffc02d9a9f64e736d06bb4e4a04a94b + 03b4b258fc72e5663f2ad701df5d70129aa2df8a - + https://github.com/dotnet/arcade - 6bcab7722ffc02d9a9f64e736d06bb4e4a04a94b + 03b4b258fc72e5663f2ad701df5d70129aa2df8a - + https://github.com/dotnet/arcade - 6bcab7722ffc02d9a9f64e736d06bb4e4a04a94b + 03b4b258fc72e5663f2ad701df5d70129aa2df8a - + https://github.com/dotnet/arcade - 6bcab7722ffc02d9a9f64e736d06bb4e4a04a94b + 03b4b258fc72e5663f2ad701df5d70129aa2df8a - + https://github.com/dotnet/arcade - 6bcab7722ffc02d9a9f64e736d06bb4e4a04a94b + 03b4b258fc72e5663f2ad701df5d70129aa2df8a - + https://github.com/dotnet/arcade - 6bcab7722ffc02d9a9f64e736d06bb4e4a04a94b + 03b4b258fc72e5663f2ad701df5d70129aa2df8a diff --git a/eng/Versions.props b/eng/Versions.props index 4a9a9d128b..0da47be3c2 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -57,10 +57,10 @@ release - 10.0.0-beta.25207.4 - 10.0.0-beta.25207.4 - 10.0.0-beta.25207.4 - 10.0.0-beta.25207.4 + 10.0.0-beta.25209.3 + 10.0.0-beta.25209.3 + 10.0.0-beta.25209.3 + 10.0.0-beta.25209.3 1.1.87-gba258badda diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index 5da3c2a2a2..4f1dc42e02 100644 --- 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/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index a8c0bd3b92..5757915edb 100644 --- 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/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index a261517ef9..1eda208a3b 100644 --- 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/global.json b/global.json index 26248e55b0..8b944650f6 100644 --- a/global.json +++ b/global.json @@ -3,8 +3,8 @@ "dotnet": "10.0.100-preview.3.25167.3" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25207.4", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25207.4", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25209.3", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25209.3", "Microsoft.Build.Traversal": "3.4.0" } }