From 329d2b244bc3f81cd0d206817cddf8cb77de5a6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Fri, 19 Sep 2025 15:39:03 +0200 Subject: [PATCH 1/5] Remove darc-pub-dotnet-runtime-488a8a3 feed from Wasm tests (#119882) --- src/mono/wasi/Wasi.Build.Tests/data/nuget8.config | 5 ----- src/mono/wasm/Wasm.Build.Tests/data/nuget8.config | 5 ----- 2 files changed, 10 deletions(-) diff --git a/src/mono/wasi/Wasi.Build.Tests/data/nuget8.config b/src/mono/wasi/Wasi.Build.Tests/data/nuget8.config index 4c33988a4365b8..dfdc8009c6a5d5 100644 --- a/src/mono/wasi/Wasi.Build.Tests/data/nuget8.config +++ b/src/mono/wasi/Wasi.Build.Tests/data/nuget8.config @@ -9,11 +9,6 @@ - - - - - diff --git a/src/mono/wasm/Wasm.Build.Tests/data/nuget8.config b/src/mono/wasm/Wasm.Build.Tests/data/nuget8.config index 4c33988a4365b8..dfdc8009c6a5d5 100644 --- a/src/mono/wasm/Wasm.Build.Tests/data/nuget8.config +++ b/src/mono/wasm/Wasm.Build.Tests/data/nuget8.config @@ -9,11 +9,6 @@ - - - - - From 5e5dc1e2111897ff3b70e2bc9d9ce366d010bca0 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 20 Sep 2025 12:05:44 -0700 Subject: [PATCH 2/5] Update dependencies from https://github.com/dotnet/cecil build 20250914.1 (#119740) On relative base path root Microsoft.DotNet.Cecil From Version 0.11.4-alpha.25462.1 -> To Version 0.11.4-alpha.25464.1 Co-authored-by: dotnet-maestro[bot] Co-authored-by: Tanner Gooding --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 40a419a512a69c..db3ae65f3be800 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,9 +85,9 @@ 02fe27cd6a9b001c8feb7938e6ef4b3799745759 - + https://github.com/dotnet/cecil - 73a1d3d630d4ae0359ab56a4b79f6311585b829d + 49ebda4ca79ea41a15013d5dcadd18d3af8d06d6 diff --git a/eng/Versions.props b/eng/Versions.props index f83247206e9e36..4e9ed0c328e021 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -225,7 +225,7 @@ 8.0.0-rc.1.23406.6 - 0.11.4-alpha.25462.1 + 0.11.4-alpha.25464.1 8.0.0-rc.1.23406.6 From 8c89eef4507890735dbddefa07756df83badb35b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 22 Sep 2025 08:28:41 -0700 Subject: [PATCH 3/5] [release/8.0] Update dependencies from dotnet/emsdk (#119751) * Update dependencies from https://github.com/dotnet/emsdk build 20250915.1 On relative base path root Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.21-servicing.25458.3 -> To Version 8.0.21-servicing.25465.1 Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100 From Version 8.0.21 -> To Version 8.0.21 * Update dependencies from https://github.com/dotnet/emsdk build 20250916.1 On relative base path root Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.21-servicing.25458.3 -> To Version 8.0.21-servicing.25466.1 Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100 From Version 8.0.21 -> To Version 8.0.21 * Update dependencies from https://github.com/dotnet/emsdk build 20250916.5 On relative base path root Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.21-servicing.25458.3 -> To Version 8.0.21-servicing.25466.5 Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100 From Version 8.0.21 -> To Version 8.0.21 * Update dependencies from https://github.com/dotnet/emsdk build 20250917.3 On relative base path root Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.21-servicing.25458.3 -> To Version 8.0.21-servicing.25467.3 Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100 From Version 8.0.21 -> To Version 8.0.21 * Update dependencies from https://github.com/dotnet/emsdk build 20250919.3 On relative base path root Microsoft.SourceBuild.Intermediate.emsdk From Version 8.0.21-servicing.25458.3 -> To Version 8.0.21-servicing.25469.3 Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100 From Version 8.0.21 -> To Version 8.0.21 --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: Tanner Gooding --- NuGet.config | 2 +- eng/Version.Details.xml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6471ea519c49c5..51374fcc762fc8 100644 --- a/NuGet.config +++ b/NuGet.config @@ -9,7 +9,7 @@ - + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index db3ae65f3be800..3405c8a3287129 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,11 +92,11 @@ https://github.com/dotnet/emsdk - ea366a7a40bc588c70ef59376040130baf864c85 + 42532a7524749ad5d48d1820eaa7d4ab7e77faa6 - + https://github.com/dotnet/emsdk - ea366a7a40bc588c70ef59376040130baf864c85 + 42532a7524749ad5d48d1820eaa7d4ab7e77faa6 From 8e21a9f73a33e34d6c51b638b8c4beed384bd3b3 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 23 Sep 2025 11:13:17 -0700 Subject: [PATCH 4/5] Update dependencies from https://github.com/dotnet/cecil build 20250921.2 (#119980) On relative base path root Microsoft.DotNet.Cecil From Version 0.11.4-alpha.25464.1 -> To Version 0.11.4-alpha.25471.2 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 867b25c80ac2eb..7a79aec52284be 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -85,9 +85,9 @@ 02fe27cd6a9b001c8feb7938e6ef4b3799745759 - + https://github.com/dotnet/cecil - 49ebda4ca79ea41a15013d5dcadd18d3af8d06d6 + e7b42fc5084299c4c62717ae169f55aa1f6d8559 diff --git a/eng/Versions.props b/eng/Versions.props index 7316ef51828898..2048aadb25fed1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -225,7 +225,7 @@ 8.0.0-rc.1.23406.6 - 0.11.4-alpha.25464.1 + 0.11.4-alpha.25471.2 8.0.0-rc.1.23406.6 From 4975f15711e6b9fa10bd29df8547283379559bf4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 24 Sep 2025 02:28:28 +0000 Subject: [PATCH 5/5] Update dependencies from https://github.com/dotnet/arcade build 20250923.1 (#120026) On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Packaging , Microsoft.DotNet.Build.Tasks.TargetFramework , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Build.Tasks.Workloads , Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.GenAPI , Microsoft.DotNet.GenFacades , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.PackageTesting , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.VersionTools.Tasks , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25461.1 -> To Version 8.0.0-beta.25473.1 Microsoft.DotNet.XUnitConsoleRunner From Version 2.5.1-beta.25461.1 -> To Version 2.5.1-beta.25473.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 72 +++++++++---------- eng/Versions.props | 30 ++++---- .../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 | 6 +- 7 files changed, 74 insertions(+), 56 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 7a79aec52284be..46ecf35d10ab60 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -111,9 +111,9 @@ - + https://github.com/dotnet/arcade - 958612453c58fd32328461580b19ce5ecf4aedd2 + ea77ace912db0e1cf28f199cb456b27fe311635e @@ -121,69 +121,69 @@ 73f0850939d96131c28cf6ea6ee5aacb4da0083a - + https://github.com/dotnet/arcade - 958612453c58fd32328461580b19ce5ecf4aedd2 + ea77ace912db0e1cf28f199cb456b27fe311635e - + https://github.com/dotnet/arcade - 958612453c58fd32328461580b19ce5ecf4aedd2 + ea77ace912db0e1cf28f199cb456b27fe311635e - + https://github.com/dotnet/arcade - 958612453c58fd32328461580b19ce5ecf4aedd2 + ea77ace912db0e1cf28f199cb456b27fe311635e - + https://github.com/dotnet/arcade - 958612453c58fd32328461580b19ce5ecf4aedd2 + ea77ace912db0e1cf28f199cb456b27fe311635e - + https://github.com/dotnet/arcade - 958612453c58fd32328461580b19ce5ecf4aedd2 + ea77ace912db0e1cf28f199cb456b27fe311635e - + https://github.com/dotnet/arcade - 958612453c58fd32328461580b19ce5ecf4aedd2 + ea77ace912db0e1cf28f199cb456b27fe311635e - + https://github.com/dotnet/arcade - 958612453c58fd32328461580b19ce5ecf4aedd2 + ea77ace912db0e1cf28f199cb456b27fe311635e - + https://github.com/dotnet/arcade - 958612453c58fd32328461580b19ce5ecf4aedd2 + ea77ace912db0e1cf28f199cb456b27fe311635e - + https://github.com/dotnet/arcade - 958612453c58fd32328461580b19ce5ecf4aedd2 + ea77ace912db0e1cf28f199cb456b27fe311635e - + https://github.com/dotnet/arcade - 958612453c58fd32328461580b19ce5ecf4aedd2 + ea77ace912db0e1cf28f199cb456b27fe311635e - + https://github.com/dotnet/arcade - 958612453c58fd32328461580b19ce5ecf4aedd2 + ea77ace912db0e1cf28f199cb456b27fe311635e - + https://github.com/dotnet/arcade - 958612453c58fd32328461580b19ce5ecf4aedd2 + ea77ace912db0e1cf28f199cb456b27fe311635e - + https://github.com/dotnet/arcade - 958612453c58fd32328461580b19ce5ecf4aedd2 + ea77ace912db0e1cf28f199cb456b27fe311635e - + https://github.com/dotnet/arcade - 958612453c58fd32328461580b19ce5ecf4aedd2 + ea77ace912db0e1cf28f199cb456b27fe311635e - + https://github.com/dotnet/arcade - 958612453c58fd32328461580b19ce5ecf4aedd2 + ea77ace912db0e1cf28f199cb456b27fe311635e - + https://github.com/dotnet/arcade - 958612453c58fd32328461580b19ce5ecf4aedd2 + ea77ace912db0e1cf28f199cb456b27fe311635e https://github.com/dotnet/runtime-assets @@ -334,9 +334,9 @@ https://github.com/dotnet/xharness fc7f1ca0ff5b949ba7b7500e5aa9a01e4a43d894 - + https://github.com/dotnet/arcade - 958612453c58fd32328461580b19ce5ecf4aedd2 + ea77ace912db0e1cf28f199cb456b27fe311635e https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 2048aadb25fed1..2e051e9dc7b507 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -87,21 +87,21 @@ 8.0.100 - 8.0.0-beta.25461.1 - 8.0.0-beta.25461.1 - 8.0.0-beta.25461.1 - 8.0.0-beta.25461.1 - 8.0.0-beta.25461.1 - 2.5.1-beta.25461.1 - 8.0.0-beta.25461.1 - 8.0.0-beta.25461.1 - 8.0.0-beta.25461.1 - 8.0.0-beta.25461.1 - 8.0.0-beta.25461.1 - 8.0.0-beta.25461.1 - 8.0.0-beta.25461.1 - 8.0.0-beta.25461.1 - 8.0.0-beta.25461.1 + 8.0.0-beta.25473.1 + 8.0.0-beta.25473.1 + 8.0.0-beta.25473.1 + 8.0.0-beta.25473.1 + 8.0.0-beta.25473.1 + 2.5.1-beta.25473.1 + 8.0.0-beta.25473.1 + 8.0.0-beta.25473.1 + 8.0.0-beta.25473.1 + 8.0.0-beta.25473.1 + 8.0.0-beta.25473.1 + 8.0.0-beta.25473.1 + 8.0.0-beta.25473.1 + 8.0.0-beta.25473.1 + 8.0.0-beta.25473.1 6.0.0-preview.1.102 diff --git a/eng/common/templates-official/job/publish-build-assets.yml b/eng/common/templates-official/job/publish-build-assets.yml index 7a320e9bab20a2..a99d79df863c35 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 803a95aacf4e01..03aa64e1741ff6 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 2956d8117f73c0..1fcdcc9adc342e 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 34387a8c7acddc..7eafc256758fe3 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 a5c4619b098036..84cbccc8f62719 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "8.0.120" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25461.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25461.1", - "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.25461.1", + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25473.1", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25473.1", + "Microsoft.DotNet.SharedFramework.Sdk": "8.0.0-beta.25473.1", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "8.0.0-rc.1.23406.6"