From cd07aaae4cfee3ff059c09865f9b0945d23fc146 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 23 Aug 2025 02:04:29 +0000 Subject: [PATCH 01/12] Update dependencies from https://github.com/dotnet/arcade build 20250822.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25415.2 -> To Version 8.0.0-beta.25422.2 --- NuGet.config | 2 ++ eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- global.json | 4 ++-- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/NuGet.config b/NuGet.config index bb68040e5d6f..bee2e30365fc 100644 --- a/NuGet.config +++ b/NuGet.config @@ -23,6 +23,8 @@ + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a811669eb9ac..6385da794a1a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - 2f70e458e03e348a3a1f3fd6b9b70b4fcd5ba596 + 3e8ada7bce86d4218abd6d9a40daadddabdf16c9 - + https://github.com/dotnet/arcade - 2f70e458e03e348a3a1f3fd6b9b70b4fcd5ba596 + 3e8ada7bce86d4218abd6d9a40daadddabdf16c9 - + https://github.com/dotnet/arcade - 2f70e458e03e348a3a1f3fd6b9b70b4fcd5ba596 + 3e8ada7bce86d4218abd6d9a40daadddabdf16c9 - + https://github.com/dotnet/arcade - 2f70e458e03e348a3a1f3fd6b9b70b4fcd5ba596 + 3e8ada7bce86d4218abd6d9a40daadddabdf16c9 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 571d8748a5f6..73b919974f29 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 8.0.0 4.0.0 8.0.0 - 8.0.0-beta.25415.2 + 8.0.0-beta.25422.2 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -215,7 +215,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.25415.2 + 8.0.0-beta.25422.2 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/global.json b/global.json index 35c55ef5902d..1ee151ac29b8 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25415.2", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25415.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25422.2", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25422.2" } } From be750c88fd1a63ee9885d73f432fa9629090e890 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 28 Aug 2025 02:04:27 +0000 Subject: [PATCH 02/12] Update dependencies from https://github.com/dotnet/arcade build 20250827.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25415.2 -> To Version 8.0.0-beta.25427.4 --- NuGet.config | 3 +++ eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- .../templates-official/job/source-build.yml | 4 ++++ .../templates-official/jobs/source-build.yml | 5 +++++ .../templates-official/steps/source-build.yml | 8 +++++++- eng/common/templates/job/source-build.yml | 4 ++++ eng/common/templates/jobs/source-build.yml | 5 +++++ eng/common/templates/steps/source-build.yml | 8 +++++++- global.json | 4 ++-- 10 files changed, 47 insertions(+), 14 deletions(-) diff --git a/NuGet.config b/NuGet.config index bee2e30365fc..9a7e2bcab6c9 100644 --- a/NuGet.config +++ b/NuGet.config @@ -23,6 +23,9 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 6385da794a1a..fb156bbf52a0 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - 3e8ada7bce86d4218abd6d9a40daadddabdf16c9 + 6e78cc9faf0ab29992b01007d71519655344e74c - + https://github.com/dotnet/arcade - 3e8ada7bce86d4218abd6d9a40daadddabdf16c9 + 6e78cc9faf0ab29992b01007d71519655344e74c - + https://github.com/dotnet/arcade - 3e8ada7bce86d4218abd6d9a40daadddabdf16c9 + 6e78cc9faf0ab29992b01007d71519655344e74c - + https://github.com/dotnet/arcade - 3e8ada7bce86d4218abd6d9a40daadddabdf16c9 + 6e78cc9faf0ab29992b01007d71519655344e74c https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 73b919974f29..f128e31d904a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 8.0.0 4.0.0 8.0.0 - 8.0.0-beta.25422.2 + 8.0.0-beta.25427.4 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -215,7 +215,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.25422.2 + 8.0.0-beta.25427.4 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/eng/common/templates-official/job/source-build.yml b/eng/common/templates-official/job/source-build.yml index 4217d6d8b148..7b9c58a90c5e 100644 --- a/eng/common/templates-official/job/source-build.yml +++ b/eng/common/templates-official/job/source-build.yml @@ -31,6 +31,9 @@ parameters: # container and pool. platform: {} + # Optional list of directories to ignore for component governance scans. + cgIgnoreDirectories: [] + # If set to true and running on a non-public project, # Internal blob storage locations will be enabled. # This is not enabled by default because many repositories do not need internal sources @@ -73,3 +76,4 @@ jobs: - template: /eng/common/templates-official/steps/source-build.yml parameters: platform: ${{ parameters.platform }} + cgIgnoreDirectories: ${{ parameters.cgIgnoreDirectories }} diff --git a/eng/common/templates-official/jobs/source-build.yml b/eng/common/templates-official/jobs/source-build.yml index b9247be1547b..21a346fbd6c7 100644 --- a/eng/common/templates-official/jobs/source-build.yml +++ b/eng/common/templates-official/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. + cgIgnoreDirectories: [] + # If set to true and running on a non-public project, # Internal nuget and blob storage locations will be enabled. # This is not enabled by default because many repositories do not need internal sources @@ -44,6 +47,7 @@ jobs: parameters: jobNamePrefix: ${{ parameters.jobNamePrefix }} platform: ${{ platform }} + cgIgnoreDirectories: ${{ parameters.cgIgnoreDirectories }} enableInternalSources: ${{ parameters.enableInternalSources }} - ${{ if eq(length(parameters.platforms), 0) }}: @@ -51,4 +55,5 @@ jobs: parameters: jobNamePrefix: ${{ parameters.jobNamePrefix }} platform: ${{ parameters.defaultManagedPlatform }} + cgIgnoreDirectories: ${{ parameters.cgIgnoreDirectories }} enableInternalSources: ${{ parameters.enableInternalSources }} diff --git a/eng/common/templates-official/steps/source-build.yml b/eng/common/templates-official/steps/source-build.yml index a69631446da2..b63043da4b9f 100644 --- a/eng/common/templates-official/steps/source-build.yml +++ b/eng/common/templates-official/steps/source-build.yml @@ -12,6 +12,9 @@ parameters: # 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. + cgIgnoreDirectories: [] + steps: # Build. Keep it self-contained for simple reusability. (No source-build-specific job variables.) - script: | @@ -126,4 +129,7 @@ steps: - task: ComponentGovernanceComponentDetection@0 displayName: Component Detection (Exclude upstream cache) inputs: - ignoreDirectories: '$(System.DefaultWorkingDirectory)/artifacts/source-build/self/src/artifacts/obj/source-built-upstream-cache' + ${{ if eq(length(parameters.cgIgnoreDirectories), 0) }}: + ignoreDirectories: '$(System.DefaultWorkingDirectory)/artifacts/source-build/self/src/artifacts/obj/source-built-upstream-cache' + ${{ else }}: + ignoreDirectories: ${{ join(',', parameters.cgIgnoreDirectories) }} diff --git a/eng/common/templates/job/source-build.yml b/eng/common/templates/job/source-build.yml index c48f95d93d91..97021335cfc4 100644 --- a/eng/common/templates/job/source-build.yml +++ b/eng/common/templates/job/source-build.yml @@ -31,6 +31,9 @@ parameters: # container and pool. platform: {} + # Optional list of directories to ignore for component governance scans. + cgIgnoreDirectories: [] + # If set to true and running on a non-public project, # Internal blob storage locations will be enabled. # This is not enabled by default because many repositories do not need internal sources @@ -72,3 +75,4 @@ jobs: - template: /eng/common/templates/steps/source-build.yml parameters: platform: ${{ parameters.platform }} + cgIgnoreDirectories: ${{ parameters.cgIgnoreDirectories }} diff --git a/eng/common/templates/jobs/source-build.yml b/eng/common/templates/jobs/source-build.yml index 3ec997108107..4dde599add97 100644 --- a/eng/common/templates/jobs/source-build.yml +++ b/eng/common/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. + cgIgnoreDirectories: [] + # If set to true and running on a non-public project, # Internal nuget and blob storage locations will be enabled. # This is not enabled by default because many repositories do not need internal sources @@ -44,6 +47,7 @@ jobs: parameters: jobNamePrefix: ${{ parameters.jobNamePrefix }} platform: ${{ platform }} + cgIgnoreDirectories: ${{ parameters.cgIgnoreDirectories }} enableInternalSources: ${{ parameters.enableInternalSources }} - ${{ if eq(length(parameters.platforms), 0) }}: @@ -51,4 +55,5 @@ jobs: parameters: jobNamePrefix: ${{ parameters.jobNamePrefix }} platform: ${{ parameters.defaultManagedPlatform }} + cgIgnoreDirectories: ${{ parameters.cgIgnoreDirectories }} enableInternalSources: ${{ parameters.enableInternalSources }} diff --git a/eng/common/templates/steps/source-build.yml b/eng/common/templates/steps/source-build.yml index 4fb5643e5ded..ae06b26ea373 100644 --- a/eng/common/templates/steps/source-build.yml +++ b/eng/common/templates/steps/source-build.yml @@ -12,6 +12,9 @@ parameters: # 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. + cgIgnoreDirectories: [] + steps: # Build. Keep it self-contained for simple reusability. (No source-build-specific job variables.) - script: | @@ -126,4 +129,7 @@ steps: - task: ComponentGovernanceComponentDetection@0 displayName: Component Detection (Exclude upstream cache) inputs: - ignoreDirectories: '$(System.DefaultWorkingDirectory)/artifacts/source-build/self/src/artifacts/obj/source-built-upstream-cache' + ${{ if eq(length(parameters.cgIgnoreDirectories), 0) }}: + ignoreDirectories: '$(System.DefaultWorkingDirectory)/artifacts/source-build/self/src/artifacts/obj/source-built-upstream-cache' + ${{ else }}: + ignoreDirectories: ${{ join(',', parameters.cgIgnoreDirectories) }} diff --git a/global.json b/global.json index 1ee151ac29b8..79de562355a1 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25422.2", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25422.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25427.4", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25427.4" } } From 1218915391f68a67e64833e1473d57e3df02f15f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 6 Sep 2025 02:03:25 +0000 Subject: [PATCH 03/12] Update dependencies from https://github.com/dotnet/arcade build 20250905.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25415.2 -> To Version 8.0.0-beta.25455.3 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- global.json | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fb156bbf52a0..08106fc886fd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - 6e78cc9faf0ab29992b01007d71519655344e74c + 09625cb3b98ebe646a63dfea19a0c0127e88459a - + https://github.com/dotnet/arcade - 6e78cc9faf0ab29992b01007d71519655344e74c + 09625cb3b98ebe646a63dfea19a0c0127e88459a - + https://github.com/dotnet/arcade - 6e78cc9faf0ab29992b01007d71519655344e74c + 09625cb3b98ebe646a63dfea19a0c0127e88459a - + https://github.com/dotnet/arcade - 6e78cc9faf0ab29992b01007d71519655344e74c + 09625cb3b98ebe646a63dfea19a0c0127e88459a https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index f128e31d904a..7446c5113ae1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 8.0.0 4.0.0 8.0.0 - 8.0.0-beta.25427.4 + 8.0.0-beta.25455.3 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -215,7 +215,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.25427.4 + 8.0.0-beta.25455.3 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/global.json b/global.json index 79de562355a1..08607d5d0dc2 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25427.4", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25427.4" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25455.3", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25455.3" } } From a49fb4005462413a2f780820c2b95ab6a4ac0140 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 12 Sep 2025 02:04:01 +0000 Subject: [PATCH 04/12] Update dependencies from https://github.com/dotnet/arcade build 20250911.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25415.2 -> To Version 8.0.0-beta.25461.1 --- NuGet.config | 6 ------ eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- global.json | 6 +++--- 4 files changed, 13 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index e12afd6c2deb..7c4ca7e0d182 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,12 +22,6 @@ - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 96d5acea51ae..e3a7f975b482 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - 09625cb3b98ebe646a63dfea19a0c0127e88459a + 958612453c58fd32328461580b19ce5ecf4aedd2 - + https://github.com/dotnet/arcade - 09625cb3b98ebe646a63dfea19a0c0127e88459a + 958612453c58fd32328461580b19ce5ecf4aedd2 - + https://github.com/dotnet/arcade - 09625cb3b98ebe646a63dfea19a0c0127e88459a + 958612453c58fd32328461580b19ce5ecf4aedd2 - + https://github.com/dotnet/arcade - 09625cb3b98ebe646a63dfea19a0c0127e88459a + 958612453c58fd32328461580b19ce5ecf4aedd2 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index bdab6677fdba..45f4dfe37a41 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 8.0.0 4.0.0 8.0.0 - 8.0.0-beta.25455.3 + 8.0.0-beta.25461.1 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -215,7 +215,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.25455.3 + 8.0.0-beta.25461.1 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/global.json b/global.json index 08607d5d0dc2..f6d3f7a5d730 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.119", + "dotnet": "8.0.120", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)" @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25455.3", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25455.3" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25461.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25461.1" } } From bd1d6dda8a8ab8953dbcc533416ac75f0782b63d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 13 Sep 2025 02:05:03 +0000 Subject: [PATCH 05/12] Update dependencies from https://github.com/dotnet/arcade build 20250912.5 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25415.2 -> To Version 8.0.0-beta.25462.5 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- .../job/publish-build-assets.yml | 9 ++++++++- eng/common/templates-official/jobs/jobs.yml | 2 ++ .../templates/job/publish-build-assets.yml | 9 ++++++++- eng/common/templates/jobs/jobs.yml | 2 ++ global.json | 4 ++-- 7 files changed, 32 insertions(+), 14 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e3a7f975b482..38a5f62e2a46 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - 958612453c58fd32328461580b19ce5ecf4aedd2 + dc4d6c8c4c747fd66c63126fc933615fc69ebe9b - + https://github.com/dotnet/arcade - 958612453c58fd32328461580b19ce5ecf4aedd2 + dc4d6c8c4c747fd66c63126fc933615fc69ebe9b - + https://github.com/dotnet/arcade - 958612453c58fd32328461580b19ce5ecf4aedd2 + dc4d6c8c4c747fd66c63126fc933615fc69ebe9b - + https://github.com/dotnet/arcade - 958612453c58fd32328461580b19ce5ecf4aedd2 + dc4d6c8c4c747fd66c63126fc933615fc69ebe9b https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 45f4dfe37a41..e6151b92074c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 8.0.0 4.0.0 8.0.0 - 8.0.0-beta.25461.1 + 8.0.0-beta.25462.5 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -215,7 +215,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.25461.1 + 8.0.0-beta.25462.5 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/eng/common/templates-official/job/publish-build-assets.yml b/eng/common/templates-official/job/publish-build-assets.yml index 7a320e9bab20..a99d79df863c 100644 --- a/eng/common/templates-official/job/publish-build-assets.yml +++ b/eng/common/templates-official/job/publish-build-assets.yml @@ -32,6 +32,8 @@ parameters: repositoryAlias: self + officialBuildId: '' + jobs: - job: Asset_Registry_Publish @@ -52,6 +54,11 @@ jobs: value: false - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: - template: /eng/common/templates-official/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) @@ -93,7 +100,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/templates-official/jobs/jobs.yml b/eng/common/templates-official/jobs/jobs.yml index 803a95aacf4e..03aa64e1741f 100644 --- a/eng/common/templates-official/jobs/jobs.yml +++ b/eng/common/templates-official/jobs/jobs.yml @@ -41,6 +41,7 @@ parameters: enableSourceIndex: false sourceIndexParams: {} 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. @@ -97,3 +98,4 @@ jobs: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }} repositoryAlias: ${{ parameters.repositoryAlias }} + officialBuildId: ${{ parameters.officialBuildId }} diff --git a/eng/common/templates/job/publish-build-assets.yml b/eng/common/templates/job/publish-build-assets.yml index 2956d8117f73..1fcdcc9adc34 100644 --- a/eng/common/templates/job/publish-build-assets.yml +++ b/eng/common/templates/job/publish-build-assets.yml @@ -32,6 +32,8 @@ parameters: repositoryAlias: self + officialBuildId: '' + jobs: - job: Asset_Registry_Publish @@ -52,6 +54,11 @@ jobs: value: false - ${{ if eq(parameters.publishAssetsImmediately, 'true') }}: - template: /eng/common/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) @@ -91,7 +98,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/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml index 34387a8c7acd..7eafc256758f 100644 --- a/eng/common/templates/jobs/jobs.yml +++ b/eng/common/templates/jobs/jobs.yml @@ -41,6 +41,7 @@ parameters: enableSourceIndex: false sourceIndexParams: {} 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. @@ -97,3 +98,4 @@ jobs: artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }} signingValidationAdditionalParameters: ${{ parameters.signingValidationAdditionalParameters }} repositoryAlias: ${{ parameters.repositoryAlias }} + officialBuildId: ${{ parameters.officialBuildId }} diff --git a/global.json b/global.json index f6d3f7a5d730..fa2de8cfdc1e 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25461.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25461.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25462.5", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25462.5" } } From c312721baf706024983c54ff889cc665b1a2e7e0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 14 Sep 2025 02:03:46 +0000 Subject: [PATCH 06/12] Update dependencies from https://github.com/dotnet/arcade build 20250912.6 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25415.2 -> To Version 8.0.0-beta.25462.6 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- global.json | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 38a5f62e2a46..a599c2645072 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - dc4d6c8c4c747fd66c63126fc933615fc69ebe9b + 1df8dfdfc8068e5180687a3079427b120de18eed - + https://github.com/dotnet/arcade - dc4d6c8c4c747fd66c63126fc933615fc69ebe9b + 1df8dfdfc8068e5180687a3079427b120de18eed - + https://github.com/dotnet/arcade - dc4d6c8c4c747fd66c63126fc933615fc69ebe9b + 1df8dfdfc8068e5180687a3079427b120de18eed - + https://github.com/dotnet/arcade - dc4d6c8c4c747fd66c63126fc933615fc69ebe9b + 1df8dfdfc8068e5180687a3079427b120de18eed https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index e6151b92074c..b346f6a9828c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 8.0.0 4.0.0 8.0.0 - 8.0.0-beta.25462.5 + 8.0.0-beta.25462.6 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -215,7 +215,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.25462.5 + 8.0.0-beta.25462.6 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/global.json b/global.json index fa2de8cfdc1e..10c92944e75c 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25462.5", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25462.5" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25462.6", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25462.6" } } From 768956021868a3696d3f41e8c67433038b4843e8 Mon Sep 17 00:00:00 2001 From: Michael Yanni Date: Mon, 15 Sep 2025 15:57:06 -0700 Subject: [PATCH 07/12] Added nowarn for NETSDK1138. --- .../Microsoft.DotNet.ApiCompat.Tool.csproj | 2 ++ .../Microsoft.DotNet.GenAPI.Tool.csproj | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/ApiCompat/Microsoft.DotNet.ApiCompat.Tool/Microsoft.DotNet.ApiCompat.Tool.csproj b/src/ApiCompat/Microsoft.DotNet.ApiCompat.Tool/Microsoft.DotNet.ApiCompat.Tool.csproj index a8775a32bd72..4b3195a0ac2d 100644 --- a/src/ApiCompat/Microsoft.DotNet.ApiCompat.Tool/Microsoft.DotNet.ApiCompat.Tool.csproj +++ b/src/ApiCompat/Microsoft.DotNet.ApiCompat.Tool/Microsoft.DotNet.ApiCompat.Tool.csproj @@ -7,6 +7,8 @@ enable Open true + + $(NoWarn);NETSDK1138 true true diff --git a/src/GenAPI/Microsoft.DotNet.GenAPI.Tool/Microsoft.DotNet.GenAPI.Tool.csproj b/src/GenAPI/Microsoft.DotNet.GenAPI.Tool/Microsoft.DotNet.GenAPI.Tool.csproj index abc87d57ecc5..809f9d6bc423 100644 --- a/src/GenAPI/Microsoft.DotNet.GenAPI.Tool/Microsoft.DotNet.GenAPI.Tool.csproj +++ b/src/GenAPI/Microsoft.DotNet.GenAPI.Tool/Microsoft.DotNet.GenAPI.Tool.csproj @@ -7,6 +7,8 @@ enable Open true + + $(NoWarn);NETSDK1138 true true From 0f783fc38246b2e5a38efaee44d53e0b402336e3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 16 Sep 2025 02:03:31 +0000 Subject: [PATCH 08/12] Update dependencies from https://github.com/dotnet/arcade build 20250915.1 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25415.2 -> To Version 8.0.0-beta.25465.1 --- NuGet.config | 13 ------------- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- global.json | 4 ++-- 4 files changed, 12 insertions(+), 25 deletions(-) diff --git a/NuGet.config b/NuGet.config index 06c093eb27f8..b11f12cf40a0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,6 @@ - @@ -14,7 +13,6 @@ - @@ -22,19 +20,11 @@ - - - - - - - - @@ -61,17 +51,14 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4508cac69495..9f896087d1e6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - 1df8dfdfc8068e5180687a3079427b120de18eed + 4bd1c6c93b5a3b8bc864d2863469c3f2e489d0af - + https://github.com/dotnet/arcade - 1df8dfdfc8068e5180687a3079427b120de18eed + 4bd1c6c93b5a3b8bc864d2863469c3f2e489d0af - + https://github.com/dotnet/arcade - 1df8dfdfc8068e5180687a3079427b120de18eed + 4bd1c6c93b5a3b8bc864d2863469c3f2e489d0af - + https://github.com/dotnet/arcade - 1df8dfdfc8068e5180687a3079427b120de18eed + 4bd1c6c93b5a3b8bc864d2863469c3f2e489d0af https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 93b8612794fb..370093d31335 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 8.0.0 4.0.0 8.0.0 - 8.0.0-beta.25462.6 + 8.0.0-beta.25465.1 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -215,7 +215,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.25462.6 + 8.0.0-beta.25465.1 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/global.json b/global.json index 10c92944e75c..bac07ff8aacc 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25462.6", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25462.6" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25465.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25465.1" } } From 7be278736bc1b36d122f129434728e5cf30887c9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 19 Sep 2025 02:05:24 +0000 Subject: [PATCH 09/12] Update dependencies from https://github.com/dotnet/arcade build 20250918.2 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25415.2 -> To Version 8.0.0-beta.25468.2 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- global.json | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9f896087d1e6..28fbb3878eb5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - 4bd1c6c93b5a3b8bc864d2863469c3f2e489d0af + 583effe8471a0e08a6422d0d2799cb99e9a3d38f - + https://github.com/dotnet/arcade - 4bd1c6c93b5a3b8bc864d2863469c3f2e489d0af + 583effe8471a0e08a6422d0d2799cb99e9a3d38f - + https://github.com/dotnet/arcade - 4bd1c6c93b5a3b8bc864d2863469c3f2e489d0af + 583effe8471a0e08a6422d0d2799cb99e9a3d38f - + https://github.com/dotnet/arcade - 4bd1c6c93b5a3b8bc864d2863469c3f2e489d0af + 583effe8471a0e08a6422d0d2799cb99e9a3d38f https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 370093d31335..c4083cf5cb70 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 8.0.0 4.0.0 8.0.0 - 8.0.0-beta.25465.1 + 8.0.0-beta.25468.2 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -215,7 +215,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.25465.1 + 8.0.0-beta.25468.2 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/global.json b/global.json index bac07ff8aacc..1dc34182c654 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25465.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25465.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25468.2", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25468.2" } } From 457119d17177d6cbdedfdcac48b4922d993262d2 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 23 Sep 2025 21:33:55 +0000 Subject: [PATCH 10/12] Update dependencies from https://github.com/dotnet/arcade build 20250923.1 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25415.2 -> To Version 8.0.0-beta.25473.1 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- global.json | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 28fbb3878eb5..9ab6d25e5661 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - 583effe8471a0e08a6422d0d2799cb99e9a3d38f + ea77ace912db0e1cf28f199cb456b27fe311635e - + https://github.com/dotnet/arcade - 583effe8471a0e08a6422d0d2799cb99e9a3d38f + ea77ace912db0e1cf28f199cb456b27fe311635e - + https://github.com/dotnet/arcade - 583effe8471a0e08a6422d0d2799cb99e9a3d38f + ea77ace912db0e1cf28f199cb456b27fe311635e - + https://github.com/dotnet/arcade - 583effe8471a0e08a6422d0d2799cb99e9a3d38f + ea77ace912db0e1cf28f199cb456b27fe311635e https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index c4083cf5cb70..c8af46bc91fc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 8.0.0 4.0.0 8.0.0 - 8.0.0-beta.25468.2 + 8.0.0-beta.25473.1 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -215,7 +215,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.25468.2 + 8.0.0-beta.25473.1 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/global.json b/global.json index 1dc34182c654..ab78721eca2c 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25468.2", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25468.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25473.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25473.1" } } From 57a43b14413fb18d62abe9967c74c009bb4fa645 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 26 Sep 2025 02:03:15 +0000 Subject: [PATCH 11/12] Update dependencies from https://github.com/dotnet/arcade build 20250925.2 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25415.2 -> To Version 8.0.0-beta.25475.2 --- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- global.json | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 9ab6d25e5661..83c7a978a50b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - ea77ace912db0e1cf28f199cb456b27fe311635e + b56341eb86a370acc94711f2571c3b3aff215c4b - + https://github.com/dotnet/arcade - ea77ace912db0e1cf28f199cb456b27fe311635e + b56341eb86a370acc94711f2571c3b3aff215c4b - + https://github.com/dotnet/arcade - ea77ace912db0e1cf28f199cb456b27fe311635e + b56341eb86a370acc94711f2571c3b3aff215c4b - + https://github.com/dotnet/arcade - ea77ace912db0e1cf28f199cb456b27fe311635e + b56341eb86a370acc94711f2571c3b3aff215c4b https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index c8af46bc91fc..ad32f66140f1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 8.0.0 4.0.0 8.0.0 - 8.0.0-beta.25473.1 + 8.0.0-beta.25475.2 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -215,7 +215,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.25473.1 + 8.0.0-beta.25475.2 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/global.json b/global.json index ab78721eca2c..4e4cc5f8451d 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25473.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25473.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25475.2", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25475.2" } } From 7935977c37d3b917b0efcc3d169a4112971754db Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 4 Oct 2025 15:00:11 +0000 Subject: [PATCH 12/12] Update dependencies from https://github.com/dotnet/arcade build 20251004.1 On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25415.2 -> To Version 8.0.0-beta.25504.1 --- eng/Version.Details.xml | 16 +-- eng/Versions.props | 4 +- eng/common/post-build/nuget-validation.ps1 | 11 +- eng/common/post-build/nuget-verification.ps1 | 121 ++++++++++++++++++ .../post-build/post-build.yml | 3 +- .../templates/post-build/post-build.yml | 1 - global.json | 4 +- 7 files changed, 136 insertions(+), 24 deletions(-) create mode 100644 eng/common/post-build/nuget-verification.ps1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 83c7a978a50b..9a9a3ff390ba 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - b56341eb86a370acc94711f2571c3b3aff215c4b + 3edea53c9b10e4bc63de863d71a05d47d9bb5b69 - + https://github.com/dotnet/arcade - b56341eb86a370acc94711f2571c3b3aff215c4b + 3edea53c9b10e4bc63de863d71a05d47d9bb5b69 - + https://github.com/dotnet/arcade - b56341eb86a370acc94711f2571c3b3aff215c4b + 3edea53c9b10e4bc63de863d71a05d47d9bb5b69 - + https://github.com/dotnet/arcade - b56341eb86a370acc94711f2571c3b3aff215c4b + 3edea53c9b10e4bc63de863d71a05d47d9bb5b69 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index ad32f66140f1..87982c72314e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 8.0.0 4.0.0 8.0.0 - 8.0.0-beta.25475.2 + 8.0.0-beta.25504.1 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -215,7 +215,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.25475.2 + 8.0.0-beta.25504.1 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/eng/common/post-build/nuget-validation.ps1 b/eng/common/post-build/nuget-validation.ps1 index dab3534ab538..22b1c4dfe4a7 100644 --- a/eng/common/post-build/nuget-validation.ps1 +++ b/eng/common/post-build/nuget-validation.ps1 @@ -2,20 +2,13 @@ # tool: https://github.com/NuGet/NuGetGallery/tree/jver-verify/src/VerifyMicrosoftPackage param( - [Parameter(Mandatory=$true)][string] $PackagesPath, # Path to where the packages to be validated are - [Parameter(Mandatory=$true)][string] $ToolDestinationPath # Where the validation tool should be downloaded to + [Parameter(Mandatory=$true)][string] $PackagesPath # Path to where the packages to be validated are ) try { . $PSScriptRoot\post-build-utils.ps1 - $url = 'https://raw.githubusercontent.com/NuGet/NuGetGallery/3e25ad135146676bcab0050a516939d9958bfa5d/src/VerifyMicrosoftPackage/verify.ps1' - - New-Item -ItemType 'directory' -Path ${ToolDestinationPath} -Force - - Invoke-WebRequest $url -OutFile ${ToolDestinationPath}\verify.ps1 - - & ${ToolDestinationPath}\verify.ps1 ${PackagesPath}\*.nupkg + & $PSScriptRoot\nuget-verification.ps1 ${PackagesPath}\*.nupkg } catch { Write-Host $_.ScriptStackTrace diff --git a/eng/common/post-build/nuget-verification.ps1 b/eng/common/post-build/nuget-verification.ps1 new file mode 100644 index 000000000000..8467dbf8e7c2 --- /dev/null +++ b/eng/common/post-build/nuget-verification.ps1 @@ -0,0 +1,121 @@ +<# +.SYNOPSIS + Verifies that Microsoft NuGet packages have proper metadata. +.DESCRIPTION + Downloads a verification tool and runs metadata validation on the provided NuGet packages. This script writes an + error if any of the provided packages fail validation. All arguments provided to this PowerShell script that do not + match PowerShell parameters are passed on to the verification tool downloaded during the execution of this script. +.PARAMETER NuGetExePath + The path to the nuget.exe binary to use. If not provided, nuget.exe will be downloaded into the -DownloadPath + directory. +.PARAMETER PackageSource + The package source to use to download the verification tool. If not provided, nuget.org will be used. +.PARAMETER DownloadPath + The directory path to download the verification tool and nuget.exe to. If not provided, + %TEMP%\NuGet.VerifyNuGetPackage will be used. +.PARAMETER args + Arguments that will be passed to the verification tool. +.EXAMPLE + PS> .\verify.ps1 *.nupkg + Verifies the metadata of all .nupkg files in the currect working directory. +.EXAMPLE + PS> .\verify.ps1 --help + Displays the help text of the downloaded verifiction tool. +.LINK + https://github.com/NuGet/NuGetGallery/blob/master/src/VerifyMicrosoftPackage/README.md +#> + +# This script was copied from https://github.com/NuGet/NuGetGallery/blob/3e25ad135146676bcab0050a516939d9958bfa5d/src/VerifyMicrosoftPackage/verify.ps1 + +[CmdletBinding(PositionalBinding = $false)] +param( + [string]$NuGetExePath, + [string]$PackageSource = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json", + [string]$DownloadPath, + [Parameter(ValueFromRemainingArguments = $true)] + [string[]]$args +) + +# The URL to download nuget.exe. +$nugetExeUrl = "https://dist.nuget.org/win-x86-commandline/v4.9.4/nuget.exe" + +# The package ID of the verification tool. +$packageId = "NuGet.VerifyMicrosoftPackage" + +# The location that nuget.exe and the verification tool will be downloaded to. +if (!$DownloadPath) { + $DownloadPath = (Join-Path $env:TEMP "NuGet.VerifyMicrosoftPackage") +} + +$fence = New-Object -TypeName string -ArgumentList '=', 80 + +# Create the download directory, if it doesn't already exist. +if (!(Test-Path $DownloadPath)) { + New-Item -ItemType Directory $DownloadPath | Out-Null +} +Write-Host "Using download path: $DownloadPath" + +if ($NuGetExePath) { + $nuget = $NuGetExePath +} else { + $downloadedNuGetExe = Join-Path $DownloadPath "nuget.exe" + + # Download nuget.exe, if it doesn't already exist. + if (!(Test-Path $downloadedNuGetExe)) { + Write-Host "Downloading nuget.exe from $nugetExeUrl..." + $ProgressPreference = 'SilentlyContinue' + try { + Invoke-WebRequest $nugetExeUrl -OutFile $downloadedNuGetExe + $ProgressPreference = 'Continue' + } catch { + $ProgressPreference = 'Continue' + Write-Error $_ + Write-Error "nuget.exe failed to download." + exit + } + } + + $nuget = $downloadedNuGetExe +} + +Write-Host "Using nuget.exe path: $nuget" +Write-Host " " + +# Download the latest version of the verification tool. +Write-Host "Downloading the latest version of $packageId from $packageSource..." +Write-Host $fence +& $nuget install $packageId ` + -Prerelease ` + -OutputDirectory $DownloadPath ` + -Source $PackageSource +Write-Host $fence +Write-Host " " + +if ($LASTEXITCODE -ne 0) { + Write-Error "nuget.exe failed to fetch the verify tool." + exit +} + +# Find the most recently downloaded tool +Write-Host "Finding the most recently downloaded verification tool." +$verifyProbePath = Join-Path $DownloadPath "$packageId.*" +$verifyPath = Get-ChildItem -Path $verifyProbePath -Directory ` + | Sort-Object -Property LastWriteTime -Descending ` + | Select-Object -First 1 +$verify = Join-Path $verifyPath "tools\NuGet.VerifyMicrosoftPackage.exe" +Write-Host "Using verification tool: $verify" +Write-Host " " + +# Execute the verification tool. +Write-Host "Executing the verify tool..." +Write-Host $fence +& $verify $args +Write-Host $fence +Write-Host " " + +# Respond to the exit code. +if ($LASTEXITCODE -ne 0) { + Write-Error "The verify tool found some problems." +} else { + Write-Output "The verify tool succeeded." +} \ No newline at end of file diff --git a/eng/common/templates-official/post-build/post-build.yml b/eng/common/templates-official/post-build/post-build.yml index 9fef8103991c..817e2d80dea1 100644 --- a/eng/common/templates-official/post-build/post-build.yml +++ b/eng/common/templates-official/post-build/post-build.yml @@ -134,8 +134,7 @@ stages: displayName: Validate inputs: filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/nuget-validation.ps1 - arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ - -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ + arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ - job: displayName: Signing Validation diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 6e5722dc2e17..ea1785a8aa26 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -132,7 +132,6 @@ stages: inputs: filePath: $(System.DefaultWorkingDirectory)/eng/common/post-build/nuget-validation.ps1 arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ - -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ - job: displayName: Signing Validation diff --git a/global.json b/global.json index 4e4cc5f8451d..0b7ae0dd1ace 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25475.2", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25475.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25504.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25504.1" } }