diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7c9917659fd373..f29fbabcc76b4e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -84,87 +84,87 @@ - + https://github.com/dotnet/arcade - 37f732fbfa006386f89a16be417278ea4fee375e + 5af24911dd2de348e66143167d66d05eb55a9db6 - + https://github.com/dotnet/arcade - 37f732fbfa006386f89a16be417278ea4fee375e + 5af24911dd2de348e66143167d66d05eb55a9db6 - + https://github.com/dotnet/arcade - 37f732fbfa006386f89a16be417278ea4fee375e + 5af24911dd2de348e66143167d66d05eb55a9db6 - + https://github.com/dotnet/arcade - 37f732fbfa006386f89a16be417278ea4fee375e + 5af24911dd2de348e66143167d66d05eb55a9db6 - + https://github.com/dotnet/arcade - 37f732fbfa006386f89a16be417278ea4fee375e + 5af24911dd2de348e66143167d66d05eb55a9db6 - + https://github.com/dotnet/arcade - 37f732fbfa006386f89a16be417278ea4fee375e + 5af24911dd2de348e66143167d66d05eb55a9db6 - + https://github.com/dotnet/arcade - 37f732fbfa006386f89a16be417278ea4fee375e + 5af24911dd2de348e66143167d66d05eb55a9db6 - + https://github.com/dotnet/arcade - 37f732fbfa006386f89a16be417278ea4fee375e + 5af24911dd2de348e66143167d66d05eb55a9db6 - + https://github.com/dotnet/arcade - 37f732fbfa006386f89a16be417278ea4fee375e + 5af24911dd2de348e66143167d66d05eb55a9db6 - + https://github.com/dotnet/arcade - 37f732fbfa006386f89a16be417278ea4fee375e + 5af24911dd2de348e66143167d66d05eb55a9db6 - + https://github.com/dotnet/arcade - 37f732fbfa006386f89a16be417278ea4fee375e + 5af24911dd2de348e66143167d66d05eb55a9db6 - + https://github.com/dotnet/arcade - 37f732fbfa006386f89a16be417278ea4fee375e + 5af24911dd2de348e66143167d66d05eb55a9db6 - + https://github.com/dotnet/arcade - 37f732fbfa006386f89a16be417278ea4fee375e + 5af24911dd2de348e66143167d66d05eb55a9db6 - + https://github.com/dotnet/arcade - 37f732fbfa006386f89a16be417278ea4fee375e + 5af24911dd2de348e66143167d66d05eb55a9db6 - + https://github.com/dotnet/arcade - 37f732fbfa006386f89a16be417278ea4fee375e + 5af24911dd2de348e66143167d66d05eb55a9db6 - + https://github.com/dotnet/arcade - 37f732fbfa006386f89a16be417278ea4fee375e + 5af24911dd2de348e66143167d66d05eb55a9db6 - + https://github.com/dotnet/arcade - 37f732fbfa006386f89a16be417278ea4fee375e + 5af24911dd2de348e66143167d66d05eb55a9db6 - + https://github.com/dotnet/arcade - 37f732fbfa006386f89a16be417278ea4fee375e + 5af24911dd2de348e66143167d66d05eb55a9db6 https://github.com/dotnet/arcade 7d1967403f5b12406763c666f41e3358bb542ced - + https://github.com/dotnet/arcade - 37f732fbfa006386f89a16be417278ea4fee375e + 5af24911dd2de348e66143167d66d05eb55a9db6 https://github.com/dotnet/runtime-assets @@ -348,9 +348,9 @@ https://github.com/dotnet/xharness 132fdfbd9c8f09f8c51179c1e7742f048f94734c - + https://github.com/dotnet/arcade - 37f732fbfa006386f89a16be417278ea4fee375e + 5af24911dd2de348e66143167d66d05eb55a9db6 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization @@ -402,9 +402,9 @@ 65ce1f581703f0c34f81937dcb3dc080bc169c81 - + https://github.com/dotnet/sdk - 5ebd5267376b61d01b4afc9d4cf9c832488312b2 + a081488f32ee97b730ac15197a1b0044a89a3995 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 2409fc7e3f399d..0e65b3b7689001 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,24 +83,24 @@ 0.2.0 - 10.0.100-preview.3.25173.9 + 10.0.100-preview.4.25211.22 - 10.0.0-beta.25206.1 - 10.0.0-beta.25206.1 - 10.0.0-beta.25206.1 - 10.0.0-beta.25206.1 - 2.9.2-beta.25206.1 - 10.0.0-beta.25206.1 - 2.9.2-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.25206.1 - 10.0.0-beta.25206.1 - 10.0.0-beta.25206.1 + 10.0.0-beta.25214.8 + 10.0.0-beta.25214.8 + 10.0.0-beta.25214.8 + 10.0.0-beta.25214.8 + 2.9.2-beta.25214.8 + 10.0.0-beta.25214.8 + 2.9.2-beta.25214.8 + 10.0.0-beta.25214.8 + 10.0.0-beta.25214.8 + 10.0.0-beta.25214.8 + 10.0.0-beta.25214.8 + 10.0.0-beta.25214.8 + 10.0.0-beta.25214.8 + 10.0.0-beta.25214.8 10.0.0-beta.25178.2 - 10.0.0-beta.25206.1 + 10.0.0-beta.25214.8 1.4.0 diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index 5da3c2a2a20967..4f1dc42e02c557 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 a8c0bd3b9214e5..5757915edb3ea1 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 a261517ef90679..1eda208a3bbfbe 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 4585cfd6bba1ed..e5f543ea68c270 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 d3bc0e76c95119..2f8af7bf9e33a2 100644 --- a/global.json +++ b/global.json @@ -1,16 +1,16 @@ { "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.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.25214.8", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25214.8", + "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25214.8", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "10.0.0-preview.3.25152.4"