From 199a64ebeb98ce2249f9da8e2d5c41ee0e02e835 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Wed, 5 Nov 2025 02:03:51 +0000 Subject: [PATCH 1/3] Backflow from https://github.com/dotnet/dotnet / 8ee0cc0 build 289521 [[ commit created by automation ]] --- eng/Versions.props | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eng/Versions.props b/eng/Versions.props index 13b5b13739e..fce8c20b774 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,8 +4,8 @@ 10 0 - 0 - rtm + 1 + servicing $(MajorVersion).$(MinorVersion).$(PatchVersion) - + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 5f2809e1e16..323b04871a2 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -8,30 +8,30 @@ This file should be imported by eng/Versions.props 15.9.20 15.9.20 - 10.0.0-beta.25531.102 - 10.0.0-beta.25531.102 - 10.0.0-beta.25531.102 - 10.0.0-beta.25531.102 - 10.0.0-rtm.25531.102 - 10.0.0 - 10.0.0-rtm.25531.102 - 10.0.0-rtm.25531.102 + 10.0.0-beta.25554.104 + 10.0.0-beta.25554.104 + 10.0.0-beta.25554.104 + 10.0.0-beta.25554.104 + 10.0.1-servicing.25554.104 + 10.0.1 + 10.0.1-servicing.25554.104 + 10.0.1-servicing.25554.104 8.0.0-beta.23409.2 8.0.0-beta.23409.2 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0-rtm.25531.102 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 - 10.0.0 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1-servicing.25554.104 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 + 10.0.1 10.0.0-rtm.25513.4 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 240516014c8..44c35591573 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,78 +1,78 @@ - + - + https://github.com/dotnet/dotnet - ba86126261026d26f7c30cd3434680d3965a88cf + 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 - + https://github.com/dotnet/dotnet - ba86126261026d26f7c30cd3434680d3965a88cf + 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 - + https://github.com/dotnet/dotnet - ba86126261026d26f7c30cd3434680d3965a88cf + 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 - + https://github.com/dotnet/dotnet - ba86126261026d26f7c30cd3434680d3965a88cf + 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 - + https://github.com/dotnet/dotnet - ba86126261026d26f7c30cd3434680d3965a88cf + 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int bbb14872ef0b8cdc8c2ebcd4f19f78024d5f560c - + https://github.com/dotnet/dotnet - ba86126261026d26f7c30cd3434680d3965a88cf + 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 - + https://github.com/dotnet/dotnet - ba86126261026d26f7c30cd3434680d3965a88cf + 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 - + https://github.com/dotnet/dotnet - ba86126261026d26f7c30cd3434680d3965a88cf + 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 - + https://github.com/dotnet/dotnet - ba86126261026d26f7c30cd3434680d3965a88cf + 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 - + https://github.com/dotnet/dotnet - ba86126261026d26f7c30cd3434680d3965a88cf + 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 - + https://github.com/dotnet/dotnet - ba86126261026d26f7c30cd3434680d3965a88cf + 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 - + https://github.com/dotnet/dotnet - ba86126261026d26f7c30cd3434680d3965a88cf + 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 - + https://github.com/dotnet/dotnet - ba86126261026d26f7c30cd3434680d3965a88cf + 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 - + https://github.com/dotnet/dotnet - ba86126261026d26f7c30cd3434680d3965a88cf + 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 - + https://github.com/dotnet/dotnet - ba86126261026d26f7c30cd3434680d3965a88cf + 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 - + https://github.com/dotnet/dotnet - ba86126261026d26f7c30cd3434680d3965a88cf + 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 - + https://github.com/dotnet/dotnet - ba86126261026d26f7c30cd3434680d3965a88cf + 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 https://github.com/dotnet/dotnet @@ -84,25 +84,25 @@ - + https://github.com/dotnet/dotnet - ba86126261026d26f7c30cd3434680d3965a88cf + 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 - + https://github.com/dotnet/dotnet - ba86126261026d26f7c30cd3434680d3965a88cf + 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 - + https://github.com/dotnet/dotnet - ba86126261026d26f7c30cd3434680d3965a88cf + 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 - + https://github.com/dotnet/dotnet - ba86126261026d26f7c30cd3434680d3965a88cf + 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 - + https://github.com/dotnet/dotnet - ba86126261026d26f7c30cd3434680d3965a88cf + 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index fc8d618014e..65ed3a8adef 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -1,6 +1,7 @@ # This script adds internal feeds required to build commits that depend on internal package sources. For instance, -# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. In addition also enables -# disabled internal Maestro (darc-int*) feeds. +# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. Similarly, +# dotnet-eng-internal and dotnet-tools-internal are added if dotnet-eng and dotnet-tools are present. +# In addition, this script also enables disabled internal Maestro (darc-int*) feeds. # # Optionally, this script also adds a credential entry for each of the internal feeds if supplied. # @@ -173,4 +174,16 @@ foreach ($dotnetVersion in $dotnetVersions) { } } +# Check for dotnet-eng and add dotnet-eng-internal if present +$dotnetEngSource = $sources.SelectSingleNode("add[@key='dotnet-eng']") +if ($dotnetEngSource -ne $null) { + AddOrEnablePackageSource -Sources $sources -DisabledPackageSources $disabledSources -SourceName "dotnet-eng-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-eng-internal/nuget/$feedSuffix" -Creds $creds -Username $userName -pwd $Password +} + +# Check for dotnet-tools and add dotnet-tools-internal if present +$dotnetToolsSource = $sources.SelectSingleNode("add[@key='dotnet-tools']") +if ($dotnetToolsSource -ne $null) { + AddOrEnablePackageSource -Sources $sources -DisabledPackageSources $disabledSources -SourceName "dotnet-tools-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/$feedSuffix" -Creds $creds -Username $userName -pwd $Password +} + $doc.Save($filename) diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index b97cc536379..b2163abbe71 100755 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -1,8 +1,9 @@ #!/usr/bin/env bash # This script adds internal feeds required to build commits that depend on internal package sources. For instance, -# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. In addition also enables -# disabled internal Maestro (darc-int*) feeds. +# dotnet6-internal would be added automatically if dotnet6 was found in the nuget.config file. Similarly, +# dotnet-eng-internal and dotnet-tools-internal are added if dotnet-eng and dotnet-tools are present. +# In addition, this script also enables disabled internal Maestro (darc-int*) feeds. # # Optionally, this script also adds a credential entry for each of the internal feeds if supplied. # @@ -173,6 +174,18 @@ for DotNetVersion in ${DotNetVersions[@]} ; do fi done +# Check for dotnet-eng and add dotnet-eng-internal if present +grep -i " /dev/null +if [ "$?" == "0" ]; then + AddOrEnablePackageSource "dotnet-eng-internal" "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-eng-internal/nuget/$FeedSuffix" +fi + +# Check for dotnet-tools and add dotnet-tools-internal if present +grep -i " /dev/null +if [ "$?" == "0" ]; then + AddOrEnablePackageSource "dotnet-tools-internal" "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet-tools-internal/nuget/$FeedSuffix" +fi + # I want things split line by line PrevIFS=$IFS IFS=$'\n' diff --git a/global.json b/global.json index 44742486f38..45e360802dd 100644 --- a/global.json +++ b/global.json @@ -24,8 +24,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25531.102", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25531.102", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25554.104", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25554.104", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": { From 31f3f9083b4aa233e6e2201b829ac5aeec732078 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Thu, 6 Nov 2025 02:03:54 +0000 Subject: [PATCH 3/3] Update dependencies from https://github.com/dotnet/dotnet build 289695 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25554.104 -> 10.0.0-beta.25555.106) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.Private.Windows.Core.TestUtilities (Version 10.0.1-servicing.25554.104 -> 10.0.1-servicing.25555.106) Microsoft.NETCore.App.Ref, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.1 -> 10.0.1) --- NuGet.config | 2 +- eng/Version.Details.props | 16 +++++----- eng/Version.Details.xml | 62 +++++++++++++++++++-------------------- global.json | 4 +-- 4 files changed, 42 insertions(+), 42 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3ae2a661548..a05f5acc818 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,7 +5,7 @@ - + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 323b04871a2..4c7447f0cf0 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -8,14 +8,14 @@ This file should be imported by eng/Versions.props 15.9.20 15.9.20 - 10.0.0-beta.25554.104 - 10.0.0-beta.25554.104 - 10.0.0-beta.25554.104 - 10.0.0-beta.25554.104 - 10.0.1-servicing.25554.104 + 10.0.0-beta.25555.106 + 10.0.0-beta.25555.106 + 10.0.0-beta.25555.106 + 10.0.0-beta.25555.106 + 10.0.1-servicing.25555.106 10.0.1 - 10.0.1-servicing.25554.104 - 10.0.1-servicing.25554.104 + 10.0.1-servicing.25555.106 + 10.0.1-servicing.25555.106 8.0.0-beta.23409.2 8.0.0-beta.23409.2 10.0.1 @@ -25,7 +25,7 @@ This file should be imported by eng/Versions.props 10.0.1 10.0.1 10.0.1 - 10.0.1-servicing.25554.104 + 10.0.1-servicing.25555.106 10.0.1 10.0.1 10.0.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 44c35591573..65bf4c4f81a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,26 +1,26 @@ - + - + https://github.com/dotnet/dotnet - 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 + e17b0d08def649f30aed9c09cf4a2c5741a3c76c https://github.com/dotnet/dotnet - 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 + e17b0d08def649f30aed9c09cf4a2c5741a3c76c https://github.com/dotnet/dotnet - 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 + e17b0d08def649f30aed9c09cf4a2c5741a3c76c https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int @@ -28,51 +28,51 @@ https://github.com/dotnet/dotnet - 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 + e17b0d08def649f30aed9c09cf4a2c5741a3c76c https://github.com/dotnet/dotnet - 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 + e17b0d08def649f30aed9c09cf4a2c5741a3c76c https://github.com/dotnet/dotnet - 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 + e17b0d08def649f30aed9c09cf4a2c5741a3c76c https://github.com/dotnet/dotnet - 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 + e17b0d08def649f30aed9c09cf4a2c5741a3c76c https://github.com/dotnet/dotnet - 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 + e17b0d08def649f30aed9c09cf4a2c5741a3c76c https://github.com/dotnet/dotnet - 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 + e17b0d08def649f30aed9c09cf4a2c5741a3c76c https://github.com/dotnet/dotnet - 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 + e17b0d08def649f30aed9c09cf4a2c5741a3c76c https://github.com/dotnet/dotnet - 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 + e17b0d08def649f30aed9c09cf4a2c5741a3c76c https://github.com/dotnet/dotnet - 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 + e17b0d08def649f30aed9c09cf4a2c5741a3c76c https://github.com/dotnet/dotnet - 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 + e17b0d08def649f30aed9c09cf4a2c5741a3c76c https://github.com/dotnet/dotnet - 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 + e17b0d08def649f30aed9c09cf4a2c5741a3c76c https://github.com/dotnet/dotnet - 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 + e17b0d08def649f30aed9c09cf4a2c5741a3c76c https://github.com/dotnet/dotnet @@ -84,25 +84,25 @@ - + https://github.com/dotnet/dotnet - 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 + e17b0d08def649f30aed9c09cf4a2c5741a3c76c - + https://github.com/dotnet/dotnet - 8ee0cc0bbdbacfeb5b7e703909c9731ff75600f1 + e17b0d08def649f30aed9c09cf4a2c5741a3c76c diff --git a/global.json b/global.json index 45e360802dd..2cb053155eb 100644 --- a/global.json +++ b/global.json @@ -24,8 +24,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25554.104", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25554.104", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25555.106", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25555.106", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": {