diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6f21ba9173ab..6486795fea88 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -396,39 +396,39 @@ https://github.com/dotnet/runtime 850b0bab659223effc95765190392facf7aa2593 - + https://github.com/dotnet/arcade - 37f732fbfa006386f89a16be417278ea4fee375e + 87401be5731aa537bbf4cb71d7800d1c74d5e429 - + https://github.com/dotnet/arcade - 37f732fbfa006386f89a16be417278ea4fee375e + 87401be5731aa537bbf4cb71d7800d1c74d5e429 - + https://github.com/dotnet/arcade - 37f732fbfa006386f89a16be417278ea4fee375e + 87401be5731aa537bbf4cb71d7800d1c74d5e429 - + https://github.com/dotnet/arcade - 37f732fbfa006386f89a16be417278ea4fee375e + 87401be5731aa537bbf4cb71d7800d1c74d5e429 - + https://github.com/dotnet/arcade - 37f732fbfa006386f89a16be417278ea4fee375e + 87401be5731aa537bbf4cb71d7800d1c74d5e429 - + https://github.com/dotnet/arcade - 37f732fbfa006386f89a16be417278ea4fee375e + 87401be5731aa537bbf4cb71d7800d1c74d5e429 - + https://github.com/dotnet/arcade - 37f732fbfa006386f89a16be417278ea4fee375e + 87401be5731aa537bbf4cb71d7800d1c74d5e429 - + https://github.com/dotnet/arcade - 37f732fbfa006386f89a16be417278ea4fee375e + 87401be5731aa537bbf4cb71d7800d1c74d5e429 https://github.com/dotnet/extensions diff --git a/eng/Versions.props b/eng/Versions.props index 3b065d7d9814..92118c036f3a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -168,11 +168,11 @@ 6.2.4 6.2.4 - 10.0.0-beta.25206.1 - 10.0.0-beta.25206.1 - 10.0.0-beta.25206.1 - 10.0.0-beta.25206.1 - 10.0.0-beta.25206.1 + 10.0.0-beta.25212.1 + 10.0.0-beta.25212.1 + 10.0.0-beta.25212.1 + 10.0.0-beta.25212.1 + 10.0.0-beta.25212.1 10.0.617501 diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index 5da3c2a2a209..4f1dc42e02c5 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 a8c0bd3b9214..5757915edb3e 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/core-templates/steps/install-microbuild.yml b/eng/common/core-templates/steps/install-microbuild.yml index dba506e74c3c..d0422085cb16 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/post-build/publish-using-darc.ps1 b/eng/common/post-build/publish-using-darc.ps1 index a261517ef906..1eda208a3bbf 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/eng/common/sdl/packages.config b/eng/common/sdl/packages.config index 4585cfd6bba1..e5f543ea68c2 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 2d1c83832fe2..72ba3c840f24 100644 --- a/global.json +++ b/global.json @@ -27,9 +27,9 @@ "jdk": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25206.1", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25206.1", - "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25206.1", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25212.1", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25212.1", + "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25212.1", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" }