diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a2cafb6252fc..290f0f105fe3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -631,42 +631,42 @@ - + https://github.com/dotnet/arcade - f68e9e905ba5a7b6437b7560d5a6b170057ecb2f + ee01738f27521c74f77a20e279da69215d9a9d9c - + https://github.com/dotnet/arcade - f68e9e905ba5a7b6437b7560d5a6b170057ecb2f + ee01738f27521c74f77a20e279da69215d9a9d9c - + https://github.com/dotnet/arcade - f68e9e905ba5a7b6437b7560d5a6b170057ecb2f + ee01738f27521c74f77a20e279da69215d9a9d9c - + https://github.com/dotnet/arcade - f68e9e905ba5a7b6437b7560d5a6b170057ecb2f + ee01738f27521c74f77a20e279da69215d9a9d9c - + https://github.com/dotnet/arcade - f68e9e905ba5a7b6437b7560d5a6b170057ecb2f + ee01738f27521c74f77a20e279da69215d9a9d9c - + https://github.com/dotnet/arcade - f68e9e905ba5a7b6437b7560d5a6b170057ecb2f + ee01738f27521c74f77a20e279da69215d9a9d9c - + https://github.com/dotnet/arcade - f68e9e905ba5a7b6437b7560d5a6b170057ecb2f + ee01738f27521c74f77a20e279da69215d9a9d9c - + https://github.com/dotnet/arcade - f68e9e905ba5a7b6437b7560d5a6b170057ecb2f + ee01738f27521c74f77a20e279da69215d9a9d9c - + https://github.com/dotnet/arcade - f68e9e905ba5a7b6437b7560d5a6b170057ecb2f + ee01738f27521c74f77a20e279da69215d9a9d9c diff --git a/eng/Versions.props b/eng/Versions.props index 3c55b516d66b..28dd5a34a93f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -285,12 +285,12 @@ - 10.0.0-beta.25221.2 - 10.0.0-beta.25221.2 - 10.0.0-beta.25221.2 - 10.0.0-beta.25221.2 - 10.0.0-beta.25221.2 - 10.0.0-beta.25221.2 + 10.0.0-beta.25223.2 + 10.0.0-beta.25223.2 + 10.0.0-beta.25223.2 + 10.0.0-beta.25223.2 + 10.0.0-beta.25223.2 + 10.0.0-beta.25223.2 diff --git a/eng/common/core-templates/job/source-build.yml b/eng/common/core-templates/job/source-build.yml index 05f7ad6ef0d5..d805d5faeb94 100644 --- a/eng/common/core-templates/job/source-build.yml +++ b/eng/common/core-templates/job/source-build.yml @@ -27,6 +27,8 @@ parameters: # Specifies the build script to invoke to perform the build in the repo. The default # './build.sh' should work for typical Arcade repositories, but this is customizable for # difficult situations. + # buildArguments: '' + # Specifies additional build arguments to pass to the build script. # jobProperties: {} # A list of job properties to inject at the top level, for potential extensibility beyond # container and pool. diff --git a/eng/common/core-templates/jobs/jobs.yml b/eng/common/core-templates/jobs/jobs.yml index e653d19971c9..bf35b78faa60 100644 --- a/eng/common/core-templates/jobs/jobs.yml +++ b/eng/common/core-templates/jobs/jobs.yml @@ -96,7 +96,7 @@ jobs: ${{ parameter.key }}: ${{ parameter.value }} - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - - ${{ if or(eq(parameters.enablePublishBuildAssets, true), eq(parameters.artifacts.publish.manifests, 'true'), ne(parameters.artifacts.publish.manifests, '')) }}: + - ${{ if or(eq(parameters.enablePublishBuildAssets, true), eq(parameters.artifacts.publish.manifests, 'true'), ne(parameters.artifacts.publish.manifests, ''), eq(parameters.isAssetlessBuild, true)) }}: - template: ../job/publish-build-assets.yml parameters: is1ESPipeline: ${{ parameters.is1ESPipeline }} @@ -112,7 +112,7 @@ jobs: - Source_Build_Complete runAsPublic: ${{ parameters.runAsPublic }} - publishAssetsImmediately: ${{ parameters.publishAssetsImmediately }} + publishAssetsImmediately: ${{ or(parameters.publishAssetsImmediately, parameters.isAssetlessBuild) }} isAssetlessBuild: ${{ parameters.isAssetlessBuild }} enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }} artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml index 2341706b0668..8c88ccd7b08a 100644 --- a/eng/common/core-templates/steps/source-build.yml +++ b/eng/common/core-templates/steps/source-build.yml @@ -84,6 +84,7 @@ steps: ${{ coalesce(parameters.platform.buildScript, './build.sh') }} --ci \ --configuration $buildConfig \ --restore --build --pack $publishArgs -bl \ + ${{ parameters.platform.buildArguments }} \ $officialBuildArgs \ $internalRuntimeDownloadArgs \ $internalRestoreArgs \ diff --git a/global.json b/global.json index 5b3ea2fecbf5..2d5a310a7c45 100644 --- a/global.json +++ b/global.json @@ -14,8 +14,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25221.2", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25221.2", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25223.2", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25223.2", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0" }