From b14956c02afad26f9f6f87b2a50d964f177eb345 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 1 Sep 2025 05:01:46 +0000 Subject: [PATCH 1/8] Update dependencies from https://github.com/dotnet/arcade build 20250828.3 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.25415.3 -> To Version 9.0.0-beta.25428.3 --- NuGet.config | 4 ---- eng/Version.Details.xml | 4 ++-- eng/common/core-templates/job/source-build.yml | 4 ++++ eng/common/core-templates/jobs/source-build.yml | 5 +++++ eng/common/core-templates/steps/source-build.yml | 9 ++++++++- global.json | 2 +- 6 files changed, 20 insertions(+), 8 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2622970a7f..27e60a8267 100644 --- a/NuGet.config +++ b/NuGet.config @@ -15,7 +15,6 @@ - @@ -74,7 +73,6 @@ - @@ -90,12 +88,10 @@ - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 741cd5a530..59dca8a8e4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,9 +3,9 @@ - + https://github.com/dotnet/arcade - d87d66c43d0660e5c8e84e667c5c8a8140bce888 + 5fe939db0a156be6f10e17c105b1842c0c8c8bdc diff --git a/eng/common/core-templates/job/source-build.yml b/eng/common/core-templates/job/source-build.yml index d47f09d58f..5baedac1e0 100644 --- a/eng/common/core-templates/job/source-build.yml +++ b/eng/common/core-templates/job/source-build.yml @@ -33,6 +33,9 @@ parameters: # container and pool. platform: {} + # Optional list of directories to ignore for component governance scans. + componentGovernanceIgnoreDirectories: [] + is1ESPipeline: '' # If set to true and running on a non-public project, @@ -93,3 +96,4 @@ jobs: parameters: is1ESPipeline: ${{ parameters.is1ESPipeline }} platform: ${{ parameters.platform }} + componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} diff --git a/eng/common/core-templates/jobs/source-build.yml b/eng/common/core-templates/jobs/source-build.yml index a10ccfbee6..0b408a67bd 100644 --- a/eng/common/core-templates/jobs/source-build.yml +++ b/eng/common/core-templates/jobs/source-build.yml @@ -21,6 +21,9 @@ parameters: # one job runs on 'defaultManagedPlatform'. platforms: [] + # Optional list of directories to ignore for component governance scans. + componentGovernanceIgnoreDirectories: [] + is1ESPipeline: '' # If set to true and running on a non-public project, @@ -47,6 +50,7 @@ jobs: is1ESPipeline: ${{ parameters.is1ESPipeline }} jobNamePrefix: ${{ parameters.jobNamePrefix }} platform: ${{ platform }} + componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} enableInternalSources: ${{ parameters.enableInternalSources }} - ${{ if eq(length(parameters.platforms), 0) }}: @@ -55,4 +59,5 @@ jobs: is1ESPipeline: ${{ parameters.is1ESPipeline }} jobNamePrefix: ${{ parameters.jobNamePrefix }} platform: ${{ parameters.defaultManagedPlatform }} + componentGovernanceIgnoreDirectories: ${{ parameters.componentGovernanceIgnoreDirectories }} enableInternalSources: ${{ parameters.enableInternalSources }} diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml index 730f7ab2b6..0718e4ba90 100644 --- a/eng/common/core-templates/steps/source-build.yml +++ b/eng/common/core-templates/steps/source-build.yml @@ -11,6 +11,10 @@ parameters: # for details. The entire object is described in the 'job' template for simplicity, even though # the usage of the properties on this object is split between the 'job' and 'steps' templates. platform: {} + + # Optional list of directories to ignore for component governance scans. + componentGovernanceIgnoreDirectories: [] + is1ESPipeline: false steps: @@ -126,5 +130,8 @@ steps: parameters: displayName: Component Detection (Exclude upstream cache) is1ESPipeline: ${{ parameters.is1ESPipeline }} - componentGovernanceIgnoreDirectories: '$(System.DefaultWorkingDirectory)/artifacts/sb/src/artifacts/obj/source-built-upstream-cache' + ${{ if eq(length(parameters.componentGovernanceIgnoreDirectories), 0) }}: + componentGovernanceIgnoreDirectories: '$(System.DefaultWorkingDirectory)/artifacts/sb/src/artifacts/obj/source-built-upstream-cache' + ${{ else }}: + componentGovernanceIgnoreDirectories: ${{ join(',', parameters.componentGovernanceIgnoreDirectories) }} disableComponentGovernance: ${{ eq(variables['System.TeamProject'], 'public') }} diff --git a/global.json b/global.json index fde46ee95a..4f7eb87362 100644 --- a/global.json +++ b/global.json @@ -10,6 +10,6 @@ "rollForward": "latestFeature" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25415.3" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25428.3" } } From ed56c991f49fa844e545f1f6e32ce84623d4c2d9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 11 Sep 2025 19:33:57 +0000 Subject: [PATCH 2/8] Update dependencies from https://github.com/dotnet/arcade build 20250910.1 Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.25415.3 -> To Version 9.0.0-beta.25460.1 --- eng/Version.Details.xml | 4 ++-- global.json | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 59dca8a8e4..209b3cd1b3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,9 +3,9 @@ - + https://github.com/dotnet/arcade - 5fe939db0a156be6f10e17c105b1842c0c8c8bdc + 43df065432cbc74c0fa44d7569a0c31f64883f03 diff --git a/global.json b/global.json index 4f7eb87362..e62f17f9d5 100644 --- a/global.json +++ b/global.json @@ -1,15 +1,15 @@ { "tools": { - "dotnet": "9.0.109", + "dotnet": "9.0.110", "vs": { "version": "17.8.0" } }, "sdk": { - "version": "9.0.109", + "version": "9.0.110", "rollForward": "latestFeature" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25428.3" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25460.1" } } From 22bf6d1f34116ecc372020ad102721b7320b03f6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 15 Sep 2025 05:01:29 +0000 Subject: [PATCH 3/8] Update dependencies from https://github.com/dotnet/arcade build 20250912.4 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.25415.3 -> To Version 9.0.0-beta.25462.4 --- eng/Version.Details.xml | 4 ++-- eng/common/core-templates/job/publish-build-assets.yml | 9 ++++++++- eng/common/core-templates/jobs/jobs.yml | 2 ++ global.json | 2 +- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 209b3cd1b3..6246072803 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,9 +3,9 @@ - + https://github.com/dotnet/arcade - 43df065432cbc74c0fa44d7569a0c31f64883f03 + e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index b103b7ee16..a58c8a418e 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -34,6 +34,8 @@ parameters: repositoryAlias: self + officialBuildId: '' + jobs: - job: Asset_Registry_Publish @@ -56,6 +58,11 @@ jobs: value: false # unconditional - needed for logs publishing (redactor tool version) - template: /eng/common/core-templates/post-build/common-variables.yml + - name: OfficialBuildId + ${{ if ne(parameters.officialBuildId, '') }}: + value: ${{ parameters.officialBuildId }} + ${{ else }}: + value: $(Build.BuildNumber) pool: # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) @@ -100,7 +107,7 @@ jobs: /p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests' /p:MaestroApiEndpoint=https://maestro.dot.net /p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }} - /p:OfficialBuildId=$(Build.BuildNumber) + /p:OfficialBuildId=$(OfficialBuildId) condition: ${{ parameters.condition }} continueOnError: ${{ parameters.continueOnError }} diff --git a/eng/common/core-templates/jobs/jobs.yml b/eng/common/core-templates/jobs/jobs.yml index 3129670b33..bf33cdc2cc 100644 --- a/eng/common/core-templates/jobs/jobs.yml +++ b/eng/common/core-templates/jobs/jobs.yml @@ -44,6 +44,7 @@ parameters: artifacts: {} is1ESPipeline: '' repositoryAlias: self + officialBuildId: '' # Internal resources (telemetry, microbuild) can only be accessed from non-public projects, # and some (Microbuild) should only be applied to non-PR cases for internal builds. @@ -119,3 +120,4 @@ jobs: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }} repositoryAlias: ${{ parameters.repositoryAlias }} + officialBuildId: ${{ parameters.officialBuildId }} diff --git a/global.json b/global.json index e62f17f9d5..b82c1a1423 100644 --- a/global.json +++ b/global.json @@ -10,6 +10,6 @@ "rollForward": "latestFeature" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25460.1" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25462.4" } } From 7dd37036803d5f01df1f43f8976c54c99d916f69 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Mon, 22 Sep 2025 05:01:47 +0000 Subject: [PATCH 4/8] Update dependencies from https://github.com/dotnet/arcade build 20250915.2 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.25415.3 -> To Version 9.0.0-beta.25465.2 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6246072803..bf9dab0ee1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,9 +3,9 @@ - + https://github.com/dotnet/arcade - e0fa67027049e9c3f1a0f2f50f47d50a0a3aaa92 + 024c562f73f21bfce3ab36f72c20aee30281e212 diff --git a/global.json b/global.json index b82c1a1423..f3c69414a6 100644 --- a/global.json +++ b/global.json @@ -10,6 +10,6 @@ "rollForward": "latestFeature" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25462.4" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25465.2" } } From 304b737f5897a2121c6594b0ecc09b386d4c6f81 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 23 Sep 2025 20:58:32 +0000 Subject: [PATCH 5/8] Update dependencies from https://github.com/dotnet/arcade build 20250923.2 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.25415.3 -> To Version 9.0.0-beta.25473.2 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bf9dab0ee1..2212fa020f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,9 +3,9 @@ - + https://github.com/dotnet/arcade - 024c562f73f21bfce3ab36f72c20aee30281e212 + 41e5a0dc1e0007e784118c07b26700220cdc0e63 diff --git a/global.json b/global.json index f3c69414a6..f3e3ef128e 100644 --- a/global.json +++ b/global.json @@ -10,6 +10,6 @@ "rollForward": "latestFeature" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25465.2" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25473.2" } } From 8783d6d26c1c9dd7a9ac312efd5f9f0f0dc31e07 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 25 Sep 2025 18:34:27 +0000 Subject: [PATCH 6/8] Update dependencies from https://github.com/dotnet/arcade build 20250925.3 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.25415.3 -> To Version 9.0.0-beta.25475.3 --- eng/Version.Details.xml | 4 ++-- global.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 2212fa020f..fa4f372a7e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,9 +3,9 @@ - + https://github.com/dotnet/arcade - 41e5a0dc1e0007e784118c07b26700220cdc0e63 + 6404baed798af89accd98219614e6c90c153cd8c diff --git a/global.json b/global.json index f3e3ef128e..56e31ee967 100644 --- a/global.json +++ b/global.json @@ -10,6 +10,6 @@ "rollForward": "latestFeature" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25473.2" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25475.3" } } From c0852f789698cf6e3b36b7c0838919026f12d55c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 4 Oct 2025 15:01:57 +0000 Subject: [PATCH 7/8] Update dependencies from https://github.com/dotnet/arcade build 20251003.3 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.25415.3 -> To Version 9.0.0-beta.25503.3 --- eng/Version.Details.xml | 4 ++-- eng/common/post-build/nuget-verification.ps1 | 2 +- global.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fa4f372a7e..ab3d15f10d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,9 +3,9 @@ - + https://github.com/dotnet/arcade - 6404baed798af89accd98219614e6c90c153cd8c + f8c9a6d12e5a3b281661924da22d7de1cc6ab27d diff --git a/eng/common/post-build/nuget-verification.ps1 b/eng/common/post-build/nuget-verification.ps1 index a365194a93..ac5c69ffca 100644 --- a/eng/common/post-build/nuget-verification.ps1 +++ b/eng/common/post-build/nuget-verification.ps1 @@ -30,7 +30,7 @@ [CmdletBinding(PositionalBinding = $false)] param( [string]$NuGetExePath, - [string]$PackageSource = "https://api.nuget.org/v3/index.json", + [string]$PackageSource = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json", [string]$DownloadPath, [Parameter(ValueFromRemainingArguments = $true)] [string[]]$args diff --git a/global.json b/global.json index 56e31ee967..21f753c5df 100644 --- a/global.json +++ b/global.json @@ -10,6 +10,6 @@ "rollForward": "latestFeature" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25475.3" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25503.3" } } From 72919ef80321a464ab348d9b25240f3ba15abaf6 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 15 Oct 2025 18:43:59 +0000 Subject: [PATCH 8/8] Update dependencies from https://github.com/dotnet/arcade build 20251015.2 On relative base path root Microsoft.DotNet.Arcade.Sdk From Version 9.0.0-beta.25415.3 -> To Version 9.0.0-beta.25515.2 --- eng/Version.Details.xml | 4 ++-- global.json | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ab3d15f10d..dbcc21a206 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,9 +3,9 @@ - + https://github.com/dotnet/arcade - f8c9a6d12e5a3b281661924da22d7de1cc6ab27d + 6666973b629b24e259162dba03486c23af464bab diff --git a/global.json b/global.json index 21f753c5df..6d0bdcbb5a 100644 --- a/global.json +++ b/global.json @@ -1,15 +1,15 @@ { "tools": { - "dotnet": "9.0.110", + "dotnet": "9.0.111", "vs": { "version": "17.8.0" } }, "sdk": { - "version": "9.0.110", + "version": "9.0.111", "rollForward": "latestFeature" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25503.3" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25515.2" } }