From d6906c2492275d4cc240691a13dec06e8899c4b0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 27 Apr 2025 02:02:10 +0000 Subject: [PATCH 1/3] Update dependencies from https://github.com/dotnet/arcade build 20250425.6 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.25208.6 -> To Version 9.0.0-beta.25225.6 --- eng/Version.Details.xml | 8 ++++---- eng/common/core-templates/job/source-build.yml | 2 ++ eng/common/core-templates/job/source-index-stage1.yml | 4 ++-- eng/common/core-templates/steps/source-build.yml | 1 + eng/common/sdl/packages.config | 2 +- global.json | 2 +- 6 files changed, 11 insertions(+), 8 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 79a9fa553f4..40a6acae96a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -19,14 +19,14 @@ - + https://github.com/dotnet/arcade - aa61e8c20a869bcc994f8b29eb07d927d2bec6f4 + bfbc858ba868b60fffaf7b2150f1d2165b01e786 - + https://github.com/dotnet/arcade - aa61e8c20a869bcc994f8b29eb07d927d2bec6f4 + bfbc858ba868b60fffaf7b2150f1d2165b01e786 diff --git a/eng/common/core-templates/job/source-build.yml b/eng/common/core-templates/job/source-build.yml index c4713c8b6ed..d47f09d58fd 100644 --- a/eng/common/core-templates/job/source-build.yml +++ b/eng/common/core-templates/job/source-build.yml @@ -26,6 +26,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/job/source-index-stage1.yml b/eng/common/core-templates/job/source-index-stage1.yml index 205fb5b3a39..8b833332b3e 100644 --- a/eng/common/core-templates/job/source-index-stage1.yml +++ b/eng/common/core-templates/job/source-index-stage1.yml @@ -1,7 +1,7 @@ parameters: runAsPublic: false - sourceIndexUploadPackageVersion: 2.0.0-20240522.1 - sourceIndexProcessBinlogPackageVersion: 1.0.1-20240522.1 + sourceIndexUploadPackageVersion: 2.0.0-20250425.2 + sourceIndexProcessBinlogPackageVersion: 1.0.1-20250425.2 sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" preSteps: [] diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml index 2915d29bb7f..37133b55b75 100644 --- a/eng/common/core-templates/steps/source-build.yml +++ b/eng/common/core-templates/steps/source-build.yml @@ -79,6 +79,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/eng/common/sdl/packages.config b/eng/common/sdl/packages.config index e5f543ea68c..4585cfd6bba 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 5538c45d212..ab648b7acb0 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "9.0.105" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25208.6" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25225.6" } } From 7b90874f0d96974ec8d29602ef49999f49706e0d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 6 May 2025 02:02:24 +0000 Subject: [PATCH 2/3] Update dependencies from https://github.com/dotnet/arcade build 20250505.3 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.25208.6 -> To Version 9.0.0-beta.25255.3 --- eng/Version.Details.xml | 8 ++++---- global.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 40a6acae96a..40060f89f27 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -19,14 +19,14 @@ - + https://github.com/dotnet/arcade - bfbc858ba868b60fffaf7b2150f1d2165b01e786 + dba26274ff5a0906a1880443fc3c0466d1a298ae - + https://github.com/dotnet/arcade - bfbc858ba868b60fffaf7b2150f1d2165b01e786 + dba26274ff5a0906a1880443fc3c0466d1a298ae diff --git a/global.json b/global.json index ab648b7acb0..99d2acd22b1 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "9.0.105" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25225.6" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25255.3" } } From 29f062e854725dc131caf5c9dd5d47fcd60d8560 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 7 May 2025 02:02:17 +0000 Subject: [PATCH 3/3] Update dependencies from https://github.com/dotnet/arcade build 20250505.5 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.25208.6 -> To Version 9.0.0-beta.25255.5 --- eng/Version.Details.xml | 8 ++++---- global.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 40060f89f27..a66fd5e1e52 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -19,14 +19,14 @@ - + https://github.com/dotnet/arcade - dba26274ff5a0906a1880443fc3c0466d1a298ae + 1cfa39f82d00b3659a3d367bc344241946e10681 - + https://github.com/dotnet/arcade - dba26274ff5a0906a1880443fc3c0466d1a298ae + 1cfa39f82d00b3659a3d367bc344241946e10681 diff --git a/global.json b/global.json index 99d2acd22b1..689aeb7cb07 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "9.0.105" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25255.3" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25255.5" } }