From f73e75087c002048ac33c86285f6188ff24c1a65 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 25 Apr 2025 02:03:45 +0000 Subject: [PATCH 1/6] Update dependencies from https://github.com/dotnet/dotnet --- eng/Version.Details.xml | 6 +++--- global.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cc1475db35..8d4348e816 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,6 +1,6 @@ - + https://github.com/dotnet/msbuild @@ -12,9 +12,9 @@ e9b99f554a3c298e1106ea171f5a0462780af2c5 - + https://github.com/dotnet/dotnet - 721dc7a2a59416b21fc49447d264009d708d6000 + 58950550c5c2c7a2431595699b38fd0360fd63e9 diff --git a/global.json b/global.json index b2ab67d530..31c9d36e87 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "10.0.100-preview.3.25201.16" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25223.119" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25224.104" } } From 6a31aebce58dcb9e74e291b9a7b19144d4ce8cd2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 26 Apr 2025 02:04:24 +0000 Subject: [PATCH 2/6] Update dependencies from https://github.com/dotnet/dotnet --- eng/Version.Details.xml | 6 +++--- eng/common/core-templates/job/source-build.yml | 2 ++ eng/common/core-templates/jobs/jobs.yml | 4 ++-- eng/common/core-templates/steps/source-build.yml | 5 ++--- global.json | 2 +- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8d4348e816..94f7ffce90 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,6 +1,6 @@ - + https://github.com/dotnet/msbuild @@ -12,9 +12,9 @@ e9b99f554a3c298e1106ea171f5a0462780af2c5 - + https://github.com/dotnet/dotnet - 58950550c5c2c7a2431595699b38fd0360fd63e9 + 919f64d9fd105eda6d412b926d9c20951383150f diff --git a/eng/common/core-templates/job/source-build.yml b/eng/common/core-templates/job/source-build.yml index 05f7ad6ef0..d805d5faeb 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 e653d19971..bf35b78faa 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 d65c222c06..8c88ccd7b0 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 \ @@ -93,9 +94,7 @@ steps: $portableBuildArgs \ /p:DotNetBuildSourceOnly=true \ /p:DotNetBuildRepo=true \ - /p:AssetManifestFileName=$assetManifestFileName \ - /p:SetUpSourceBuildIntermediateNupkgCache=false \ - /p:ReportPrebuiltUsage=false + /p:AssetManifestFileName=$assetManifestFileName displayName: Build # Upload build logs for diagnosis. diff --git a/global.json b/global.json index 31c9d36e87..6e15290085 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "10.0.100-preview.3.25201.16" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25224.104" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25225.102" } } From 4efca80f629cf7480c6d3240879d72fc894bcae5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 28 Apr 2025 02:01:53 +0000 Subject: [PATCH 3/6] Update dependencies from https://github.com/dotnet/dotnet --- eng/Version.Details.xml | 6 +++--- .../core-templates/steps/source-index-stage1-publish.yml | 4 ++-- global.json | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 94f7ffce90..0c232dbbaf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,6 +1,6 @@ - + https://github.com/dotnet/msbuild @@ -12,9 +12,9 @@ e9b99f554a3c298e1106ea171f5a0462780af2c5 - + https://github.com/dotnet/dotnet - 919f64d9fd105eda6d412b926d9c20951383150f + c71a5e287b51dabb97b7e0be5c4ba9b11f840402 diff --git a/eng/common/core-templates/steps/source-index-stage1-publish.yml b/eng/common/core-templates/steps/source-index-stage1-publish.yml index 473a22c471..99c2326fc1 100644 --- a/eng/common/core-templates/steps/source-index-stage1-publish.yml +++ b/eng/common/core-templates/steps/source-index-stage1-publish.yml @@ -1,6 +1,6 @@ parameters: - 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 binlogPath: artifacts/log/Debug/Build.binlog diff --git a/global.json b/global.json index 6e15290085..3df472c99c 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "10.0.100-preview.3.25201.16" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25225.102" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25227.101" } } From 56bdfae9b0b5a1d9ea92e5942355bd085813481f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 29 Apr 2025 02:01:41 +0000 Subject: [PATCH 4/6] Update dependencies from https://github.com/dotnet/dotnet --- eng/Version.Details.xml | 6 +++--- global.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0c232dbbaf..68feb05637 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,6 +1,6 @@ - + https://github.com/dotnet/msbuild @@ -12,9 +12,9 @@ e9b99f554a3c298e1106ea171f5a0462780af2c5 - + https://github.com/dotnet/dotnet - c71a5e287b51dabb97b7e0be5c4ba9b11f840402 + 5fd0935290d20e7172918595a509a367df7d5bb6 diff --git a/global.json b/global.json index 3df472c99c..4fb13522fe 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "10.0.100-preview.3.25201.16" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25227.101" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25228.101" } } From 61697903384957361521b334e5b239c0467c4691 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 29 Apr 2025 05:53:11 +0000 Subject: [PATCH 5/6] Update dependencies from https://github.com/dotnet/dotnet --- eng/Version.Details.xml | 6 +++--- global.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 68feb05637..5b384668cd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,6 +1,6 @@ - + https://github.com/dotnet/msbuild @@ -12,9 +12,9 @@ e9b99f554a3c298e1106ea171f5a0462780af2c5 - + https://github.com/dotnet/dotnet - 5fd0935290d20e7172918595a509a367df7d5bb6 + efbfb137a317fb339a6b7be36af7188cc508dc95 diff --git a/global.json b/global.json index 4fb13522fe..10335aa0cc 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "dotnet": "10.0.100-preview.3.25201.16" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25228.101" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25228.104" } } From 163aa14ac87e4f6a56779ed34aaa52b6750012f9 Mon Sep 17 00:00:00 2001 From: Viktor Hofer Date: Tue, 29 Apr 2025 07:55:52 +0200 Subject: [PATCH 6/6] Remove SB intermediates and baseline --- eng/SourceBuildPrebuiltBaseline.xml | 17 ----------------- eng/Version.Details.xml | 18 ------------------ ...osoft.DotNet.SourceBuild.Tasks.XPlat.csproj | 2 +- 3 files changed, 1 insertion(+), 36 deletions(-) delete mode 100644 eng/SourceBuildPrebuiltBaseline.xml diff --git a/eng/SourceBuildPrebuiltBaseline.xml b/eng/SourceBuildPrebuiltBaseline.xml deleted file mode 100644 index 8740a1c095..0000000000 --- a/eng/SourceBuildPrebuiltBaseline.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5b384668cd..33d06e6f7e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,27 +6,9 @@ https://github.com/dotnet/msbuild e9b99f554a3c298e1106ea171f5a0462780af2c5 - - - https://github.com/dotnet/msbuild - e9b99f554a3c298e1106ea171f5a0462780af2c5 - - https://github.com/dotnet/dotnet efbfb137a317fb339a6b7be36af7188cc508dc95 - - - https://github.com/dotnet/arcade - 80d7b4ee29c31c0886b139ad02d85da48b543cd6 - - - - - https://github.com/dotnet/source-build-reference-packages - 2228b4511efb4aca61317883c615208cd13b66a7 - - diff --git a/eng/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/Microsoft.DotNet.SourceBuild.Tasks.XPlat.csproj b/eng/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/Microsoft.DotNet.SourceBuild.Tasks.XPlat.csproj index 9953188913..b73b383733 100644 --- a/eng/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/Microsoft.DotNet.SourceBuild.Tasks.XPlat.csproj +++ b/eng/tasks/Microsoft.DotNet.SourceBuild.Tasks.XPlat/Microsoft.DotNet.SourceBuild.Tasks.XPlat.csproj @@ -1,7 +1,7 @@ - net10.0 + $(NetCurrent) $(XPlatTasksBinDir)