From f83086b3c63238f4a44ff3b65e64517e70d2a04f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Fri, 12 Sep 2025 02:03:38 +0000 Subject: [PATCH 1/5] 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.25455.3 -> 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 73763665117f..e7f26a4b751b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -22,12 +22,6 @@ - - - - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e59018fc14dc..83ebf0c6df4d 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 9a3e2eb34062..6e0e3d901f68 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 7.0.0 4.0.0 7.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 1a3830f250f3b30f0fa58e8dbf034cbb47bc552a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 13 Sep 2025 02:04:22 +0000 Subject: [PATCH 2/5] 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.25455.3 -> 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 83ebf0c6df4d..7dd3b0d2cee9 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 6e0e3d901f68..aa667465a1c5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 7.0.0 4.0.0 7.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 06ed1dbfa8b1e5c2abffe1919145d34841a9be61 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sun, 14 Sep 2025 02:03:18 +0000 Subject: [PATCH 3/5] 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.25455.3 -> 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 7dd3b0d2cee9..481de9ef5260 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 aa667465a1c5..de6c44a3249e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 7.0.0 4.0.0 7.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 e9337728868ba819ab75312bed7a95835c1642d9 Mon Sep 17 00:00:00 2001 From: Michael Yanni Date: Mon, 15 Sep 2025 10:30:07 -0700 Subject: [PATCH 4/5] 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 ac7db8ba4993663dd7f443590a5aacb2a1ed651b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Tue, 16 Sep 2025 02:03:11 +0000 Subject: [PATCH 5/5] 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.25455.3 -> To Version 8.0.0-beta.25465.1 --- NuGet.config | 7 ------- eng/Version.Details.xml | 16 ++++++++-------- eng/Versions.props | 4 ++-- global.json | 4 ++-- 4 files changed, 12 insertions(+), 19 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7f7cb458e0c8..e7f26a4b751b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,6 @@ - @@ -14,7 +13,6 @@ - @@ -22,13 +20,11 @@ - - @@ -55,7 +51,6 @@ - @@ -65,10 +60,8 @@ - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 011f78bea892..a1143a0d790f 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 dc45182e5ed0..3d4ac0f5ed42 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 7.0.0 4.0.0 7.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" } }