From a94c8eb81ba1e5ea9f6e282a717cd52270548589 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 24 Sep 2025 14:41:53 +0530 Subject: [PATCH 1/9] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20250924.1 (#11143) On relative base path root Microsoft.DotNet.Wpf.DncEng From Version 10.0.0-rc.2.25472.2 -> To Version 10.0.0-rc.2.25474.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.props | 2 +- eng/Version.Details.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index db8f175285b..f1cbccb6327 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -33,7 +33,7 @@ This file should be imported by eng/Versions.props 10.0.0-rc.2.25468.104 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25472.2 + 10.0.0-rc.2.25474.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a5ee83dbc51..8c0e20b87bc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,9 +22,9 @@ https://github.com/dotnet/dotnet 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - c27a59da6dc6255fb7552386dfde3eaf78636d7c + 544137fb099e0aa4864a49fcea9700e44897ab46 https://github.com/dotnet/dotnet From 5a022144926c9f81818ebd409b1e1f6a4a17209c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 29 Sep 2025 10:41:19 +0530 Subject: [PATCH 2/9] [release/10.0] Source code updates from dotnet/dotnet (#11144) * Backflow from https://github.com/dotnet/dotnet / 537ecf8 build 284571 [[ commit created by automation ]] * Update dependencies from https://github.com/dotnet/dotnet build 284571 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25468.104 -> 10.0.0-beta.25473.111) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rc.2.25468.104 -> 10.0.0-rc.2.25473.111) --------- Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 1 + eng/Version.Details.props | 44 +++++++++---------- eng/Version.Details.xml | 90 +++++++++++++++++++-------------------- eng/Versions.props | 2 +- global.json | 4 +- 5 files changed, 71 insertions(+), 70 deletions(-) diff --git a/NuGet.config b/NuGet.config index 627e2878975..f70711a2ac0 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,6 +4,7 @@ + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index f1cbccb6327..49dde91349c 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.25468.104 - 10.0.0-beta.25468.104 - 10.0.0-beta.25468.104 - 10.0.0-beta.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 + 10.0.0-beta.25473.111 + 10.0.0-beta.25473.111 + 10.0.0-beta.25473.111 + 10.0.0-beta.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 8.0.0-beta.23409.2 8.0.0-beta.23409.2 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 - 10.0.0-rc.2.25468.104 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 + 10.0.0-rc.2.25473.111 10.0.0-rc.2.25474.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8c0e20b87bc..5c7f7cc1f51 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,78 +1,78 @@ - + - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 544137fb099e0aa4864a49fcea9700e44897ab46 - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd https://github.com/dotnet/dotnet @@ -84,25 +84,25 @@ - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd - + https://github.com/dotnet/dotnet - 2dea164f01d307c409cfe0d0ee5cb8a0691e3c94 + 537ecf871e65b50bbe5c8d70c284caa87b69b3cd diff --git a/eng/Versions.props b/eng/Versions.props index 867daa06058..b69efb40745 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 9.0.0-preview-20241010.1 + 10.0.0-preview-20250912.1 diff --git a/global.json b/global.json index 3a41d697d9d..cfb7e01f19e 100644 --- a/global.json +++ b/global.json @@ -24,8 +24,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25468.104", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25468.104", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25473.111", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25473.111", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": { From 4de53404a8f934447a8bdbbcc0f53e63e5a4f30c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 1 Oct 2025 10:39:10 +0530 Subject: [PATCH 3/9] [release/10.0] Source code updates from dotnet/dotnet (#11153) * Backflow from https://github.com/dotnet/dotnet / 8aba88f build 285155 [[ commit created by automation ]] * Update dependencies from https://github.com/dotnet/dotnet build 285155 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25473.111 -> 10.0.0-beta.25479.109) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rc.2.25473.111 -> 10.0.0-rtm.25479.109) * Update dependencies from https://github.com/dotnet/dotnet build 285185 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25479.109 -> 10.0.0-beta.25479.115) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rtm.25479.109 -> 10.0.0-rtm.25479.115) --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.props | 44 +++++----- eng/Version.Details.xml | 90 ++++++++++---------- eng/Versions.props | 4 +- eng/common/post-build/nuget-verification.ps1 | 2 +- es-metadata.yml | 8 ++ global.json | 4 +- 6 files changed, 80 insertions(+), 72 deletions(-) create mode 100644 es-metadata.yml diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 49dde91349c..9c35a9fe321 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.25473.111 - 10.0.0-beta.25473.111 - 10.0.0-beta.25473.111 - 10.0.0-beta.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 + 10.0.0-beta.25479.115 + 10.0.0-beta.25479.115 + 10.0.0-beta.25479.115 + 10.0.0-beta.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 8.0.0-beta.23409.2 8.0.0-beta.23409.2 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 - 10.0.0-rc.2.25473.111 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 + 10.0.0-rtm.25479.115 10.0.0-rc.2.25474.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 5c7f7cc1f51..c5e135a4008 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,78 +1,78 @@ - + - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + e72b5bbe719d747036ce9c36582a205df9f1c361 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 544137fb099e0aa4864a49fcea9700e44897ab46 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + e72b5bbe719d747036ce9c36582a205df9f1c361 https://github.com/dotnet/dotnet @@ -84,25 +84,25 @@ - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + e72b5bbe719d747036ce9c36582a205df9f1c361 - + https://github.com/dotnet/dotnet - 537ecf871e65b50bbe5c8d70c284caa87b69b3cd + e72b5bbe719d747036ce9c36582a205df9f1c361 diff --git a/eng/Versions.props b/eng/Versions.props index b69efb40745..8a6e7ffea3e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -5,8 +5,8 @@ 10 0 0 - rc - 2 + rtm + $(MajorVersion).$(MinorVersion).$(PatchVersion) 15.9.20 15.9.20 - 10.0.0-beta.25479.115 - 10.0.0-beta.25479.115 - 10.0.0-beta.25479.115 - 10.0.0-beta.25479.115 - 10.0.0-rtm.25479.115 - 10.0.0-rtm.25479.115 - 10.0.0-rtm.25479.115 - 10.0.0-rtm.25479.115 + 10.0.0-beta.25507.103 + 10.0.0-beta.25507.103 + 10.0.0-beta.25507.103 + 10.0.0-beta.25507.103 + 10.0.0-rtm.25507.103 + 10.0.0-rtm.25507.103 + 10.0.0-rtm.25507.103 + 10.0.0-rtm.25507.103 8.0.0-beta.23409.2 8.0.0-beta.23409.2 - 10.0.0-rtm.25479.115 - 10.0.0-rtm.25479.115 - 10.0.0-rtm.25479.115 - 10.0.0-rtm.25479.115 - 10.0.0-rtm.25479.115 - 10.0.0-rtm.25479.115 - 10.0.0-rtm.25479.115 - 10.0.0-rtm.25479.115 - 10.0.0-rtm.25479.115 - 10.0.0-rtm.25479.115 - 10.0.0-rtm.25479.115 - 10.0.0-rtm.25479.115 - 10.0.0-rtm.25479.115 - 10.0.0-rtm.25479.115 + 10.0.0-rtm.25507.103 + 10.0.0-rtm.25507.103 + 10.0.0-rtm.25507.103 + 10.0.0-rtm.25507.103 + 10.0.0-rtm.25507.103 + 10.0.0-rtm.25507.103 + 10.0.0-rtm.25507.103 + 10.0.0-rtm.25507.103 + 10.0.0-rtm.25507.103 + 10.0.0-rtm.25507.103 + 10.0.0-rtm.25507.103 + 10.0.0-rtm.25507.103 + 10.0.0-rtm.25507.103 + 10.0.0-rtm.25507.103 10.0.0-rc.2.25474.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c5e135a4008..8bfa0595329 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,78 +1,78 @@ - + - + https://github.com/dotnet/dotnet - e72b5bbe719d747036ce9c36582a205df9f1c361 + 915977521b41280adbe21a54345be23cb5bf3536 - + https://github.com/dotnet/dotnet - e72b5bbe719d747036ce9c36582a205df9f1c361 + 915977521b41280adbe21a54345be23cb5bf3536 - + https://github.com/dotnet/dotnet - e72b5bbe719d747036ce9c36582a205df9f1c361 + 915977521b41280adbe21a54345be23cb5bf3536 - + https://github.com/dotnet/dotnet - e72b5bbe719d747036ce9c36582a205df9f1c361 + 915977521b41280adbe21a54345be23cb5bf3536 - + https://github.com/dotnet/dotnet - e72b5bbe719d747036ce9c36582a205df9f1c361 + 915977521b41280adbe21a54345be23cb5bf3536 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 544137fb099e0aa4864a49fcea9700e44897ab46 - + https://github.com/dotnet/dotnet - e72b5bbe719d747036ce9c36582a205df9f1c361 + 915977521b41280adbe21a54345be23cb5bf3536 - + https://github.com/dotnet/dotnet - e72b5bbe719d747036ce9c36582a205df9f1c361 + 915977521b41280adbe21a54345be23cb5bf3536 - + https://github.com/dotnet/dotnet - e72b5bbe719d747036ce9c36582a205df9f1c361 + 915977521b41280adbe21a54345be23cb5bf3536 - + https://github.com/dotnet/dotnet - e72b5bbe719d747036ce9c36582a205df9f1c361 + 915977521b41280adbe21a54345be23cb5bf3536 - + https://github.com/dotnet/dotnet - e72b5bbe719d747036ce9c36582a205df9f1c361 + 915977521b41280adbe21a54345be23cb5bf3536 - + https://github.com/dotnet/dotnet - e72b5bbe719d747036ce9c36582a205df9f1c361 + 915977521b41280adbe21a54345be23cb5bf3536 - + https://github.com/dotnet/dotnet - e72b5bbe719d747036ce9c36582a205df9f1c361 + 915977521b41280adbe21a54345be23cb5bf3536 - + https://github.com/dotnet/dotnet - e72b5bbe719d747036ce9c36582a205df9f1c361 + 915977521b41280adbe21a54345be23cb5bf3536 - + https://github.com/dotnet/dotnet - e72b5bbe719d747036ce9c36582a205df9f1c361 + 915977521b41280adbe21a54345be23cb5bf3536 - + https://github.com/dotnet/dotnet - e72b5bbe719d747036ce9c36582a205df9f1c361 + 915977521b41280adbe21a54345be23cb5bf3536 - + https://github.com/dotnet/dotnet - e72b5bbe719d747036ce9c36582a205df9f1c361 + 915977521b41280adbe21a54345be23cb5bf3536 - + https://github.com/dotnet/dotnet - e72b5bbe719d747036ce9c36582a205df9f1c361 + 915977521b41280adbe21a54345be23cb5bf3536 https://github.com/dotnet/dotnet @@ -84,25 +84,25 @@ - + https://github.com/dotnet/dotnet - e72b5bbe719d747036ce9c36582a205df9f1c361 + 915977521b41280adbe21a54345be23cb5bf3536 - + https://github.com/dotnet/dotnet - e72b5bbe719d747036ce9c36582a205df9f1c361 + 915977521b41280adbe21a54345be23cb5bf3536 - + https://github.com/dotnet/dotnet - e72b5bbe719d747036ce9c36582a205df9f1c361 + 915977521b41280adbe21a54345be23cb5bf3536 - + https://github.com/dotnet/dotnet - e72b5bbe719d747036ce9c36582a205df9f1c361 + 915977521b41280adbe21a54345be23cb5bf3536 - + https://github.com/dotnet/dotnet - e72b5bbe719d747036ce9c36582a205df9f1c361 + 915977521b41280adbe21a54345be23cb5bf3536 diff --git a/global.json b/global.json index 5727cb3b844..8f5e37d4c72 100644 --- a/global.json +++ b/global.json @@ -24,8 +24,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25479.115", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25479.115", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25507.103", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25507.103", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": { From 0f94a4d9b5cd76521f2419d5cb52c43e17c2a60a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 13 Oct 2025 11:29:10 +0530 Subject: [PATCH 5/9] [release/10.0] Source code updates from dotnet/dotnet (#11169) * Update dependencies from https://github.com/dotnet/dotnet build 286402 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25507.103 -> 10.0.0-beta.25509.106) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rtm.25507.103 -> 10.0.0-rtm.25509.106) * Update dependencies from https://github.com/dotnet/dotnet build 286525 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25509.106 -> 10.0.0-beta.25510.102) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rtm.25509.106 -> 10.0.0-rtm.25510.102) * Update dependencies from https://github.com/dotnet/dotnet build 286611 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25510.102 -> 10.0.0-beta.25510.110) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rtm.25510.102 -> 10.0.0-rtm.25510.110) * Update dependencies from https://github.com/dotnet/dotnet build 286686 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25510.110 -> 10.0.0-beta.25512.102) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rtm.25510.110 -> 10.0.0-rtm.25512.102) --------- Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.props | 44 ++++---- eng/Version.Details.xml | 90 ++++++++-------- eng/common/SetupNugetSources.ps1 | 71 +++++++------ eng/common/SetupNugetSources.sh | 175 ++++++++++++++++++------------- global.json | 4 +- 5 files changed, 210 insertions(+), 174 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 7fed837f27b..0068ab7bb5f 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.25507.103 - 10.0.0-beta.25507.103 - 10.0.0-beta.25507.103 - 10.0.0-beta.25507.103 - 10.0.0-rtm.25507.103 - 10.0.0-rtm.25507.103 - 10.0.0-rtm.25507.103 - 10.0.0-rtm.25507.103 + 10.0.0-beta.25512.102 + 10.0.0-beta.25512.102 + 10.0.0-beta.25512.102 + 10.0.0-beta.25512.102 + 10.0.0-rtm.25512.102 + 10.0.0-rtm.25512.102 + 10.0.0-rtm.25512.102 + 10.0.0-rtm.25512.102 8.0.0-beta.23409.2 8.0.0-beta.23409.2 - 10.0.0-rtm.25507.103 - 10.0.0-rtm.25507.103 - 10.0.0-rtm.25507.103 - 10.0.0-rtm.25507.103 - 10.0.0-rtm.25507.103 - 10.0.0-rtm.25507.103 - 10.0.0-rtm.25507.103 - 10.0.0-rtm.25507.103 - 10.0.0-rtm.25507.103 - 10.0.0-rtm.25507.103 - 10.0.0-rtm.25507.103 - 10.0.0-rtm.25507.103 - 10.0.0-rtm.25507.103 - 10.0.0-rtm.25507.103 + 10.0.0-rtm.25512.102 + 10.0.0-rtm.25512.102 + 10.0.0-rtm.25512.102 + 10.0.0-rtm.25512.102 + 10.0.0-rtm.25512.102 + 10.0.0-rtm.25512.102 + 10.0.0-rtm.25512.102 + 10.0.0-rtm.25512.102 + 10.0.0-rtm.25512.102 + 10.0.0-rtm.25512.102 + 10.0.0-rtm.25512.102 + 10.0.0-rtm.25512.102 + 10.0.0-rtm.25512.102 + 10.0.0-rtm.25512.102 10.0.0-rc.2.25474.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8bfa0595329..418ddb064c4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,78 +1,78 @@ - + - + https://github.com/dotnet/dotnet - 915977521b41280adbe21a54345be23cb5bf3536 + 0b60d265d30d96c827b73dbce74cb78f600d3c92 - + https://github.com/dotnet/dotnet - 915977521b41280adbe21a54345be23cb5bf3536 + 0b60d265d30d96c827b73dbce74cb78f600d3c92 - + https://github.com/dotnet/dotnet - 915977521b41280adbe21a54345be23cb5bf3536 + 0b60d265d30d96c827b73dbce74cb78f600d3c92 - + https://github.com/dotnet/dotnet - 915977521b41280adbe21a54345be23cb5bf3536 + 0b60d265d30d96c827b73dbce74cb78f600d3c92 - + https://github.com/dotnet/dotnet - 915977521b41280adbe21a54345be23cb5bf3536 + 0b60d265d30d96c827b73dbce74cb78f600d3c92 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 544137fb099e0aa4864a49fcea9700e44897ab46 - + https://github.com/dotnet/dotnet - 915977521b41280adbe21a54345be23cb5bf3536 + 0b60d265d30d96c827b73dbce74cb78f600d3c92 - + https://github.com/dotnet/dotnet - 915977521b41280adbe21a54345be23cb5bf3536 + 0b60d265d30d96c827b73dbce74cb78f600d3c92 - + https://github.com/dotnet/dotnet - 915977521b41280adbe21a54345be23cb5bf3536 + 0b60d265d30d96c827b73dbce74cb78f600d3c92 - + https://github.com/dotnet/dotnet - 915977521b41280adbe21a54345be23cb5bf3536 + 0b60d265d30d96c827b73dbce74cb78f600d3c92 - + https://github.com/dotnet/dotnet - 915977521b41280adbe21a54345be23cb5bf3536 + 0b60d265d30d96c827b73dbce74cb78f600d3c92 - + https://github.com/dotnet/dotnet - 915977521b41280adbe21a54345be23cb5bf3536 + 0b60d265d30d96c827b73dbce74cb78f600d3c92 - + https://github.com/dotnet/dotnet - 915977521b41280adbe21a54345be23cb5bf3536 + 0b60d265d30d96c827b73dbce74cb78f600d3c92 - + https://github.com/dotnet/dotnet - 915977521b41280adbe21a54345be23cb5bf3536 + 0b60d265d30d96c827b73dbce74cb78f600d3c92 - + https://github.com/dotnet/dotnet - 915977521b41280adbe21a54345be23cb5bf3536 + 0b60d265d30d96c827b73dbce74cb78f600d3c92 - + https://github.com/dotnet/dotnet - 915977521b41280adbe21a54345be23cb5bf3536 + 0b60d265d30d96c827b73dbce74cb78f600d3c92 - + https://github.com/dotnet/dotnet - 915977521b41280adbe21a54345be23cb5bf3536 + 0b60d265d30d96c827b73dbce74cb78f600d3c92 - + https://github.com/dotnet/dotnet - 915977521b41280adbe21a54345be23cb5bf3536 + 0b60d265d30d96c827b73dbce74cb78f600d3c92 https://github.com/dotnet/dotnet @@ -84,25 +84,25 @@ - + https://github.com/dotnet/dotnet - 915977521b41280adbe21a54345be23cb5bf3536 + 0b60d265d30d96c827b73dbce74cb78f600d3c92 - + https://github.com/dotnet/dotnet - 915977521b41280adbe21a54345be23cb5bf3536 + 0b60d265d30d96c827b73dbce74cb78f600d3c92 - + https://github.com/dotnet/dotnet - 915977521b41280adbe21a54345be23cb5bf3536 + 0b60d265d30d96c827b73dbce74cb78f600d3c92 - + https://github.com/dotnet/dotnet - 915977521b41280adbe21a54345be23cb5bf3536 + 0b60d265d30d96c827b73dbce74cb78f600d3c92 - + https://github.com/dotnet/dotnet - 915977521b41280adbe21a54345be23cb5bf3536 + 0b60d265d30d96c827b73dbce74cb78f600d3c92 diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1 index 9445c314325..fc8d618014e 100644 --- a/eng/common/SetupNugetSources.ps1 +++ b/eng/common/SetupNugetSources.ps1 @@ -7,7 +7,7 @@ # See example call for this script below. # # - task: PowerShell@2 -# displayName: Setup Private Feeds Credentials +# displayName: Setup internal Feeds Credentials # condition: eq(variables['Agent.OS'], 'Windows_NT') # inputs: # filePath: $(System.DefaultWorkingDirectory)/eng/common/SetupNugetSources.ps1 @@ -34,19 +34,28 @@ Set-StrictMode -Version 2.0 . $PSScriptRoot\tools.ps1 +# Adds or enables the package source with the given name +function AddOrEnablePackageSource($sources, $disabledPackageSources, $SourceName, $SourceEndPoint, $creds, $Username, $pwd) { + if ($disabledPackageSources -eq $null -or -not (EnableInternalPackageSource -DisabledPackageSources $disabledPackageSources -Creds $creds -PackageSourceName $SourceName)) { + AddPackageSource -Sources $sources -SourceName $SourceName -SourceEndPoint $SourceEndPoint -Creds $creds -Username $userName -pwd $Password + } +} + # Add source entry to PackageSources function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Username, $pwd) { $packageSource = $sources.SelectSingleNode("add[@key='$SourceName']") if ($packageSource -eq $null) { + Write-Host "Adding package source $SourceName" + $packageSource = $doc.CreateElement("add") $packageSource.SetAttribute("key", $SourceName) $packageSource.SetAttribute("value", $SourceEndPoint) $sources.AppendChild($packageSource) | Out-Null } else { - Write-Host "Package source $SourceName already present." + Write-Host "Package source $SourceName already present and enabled." } AddCredential -Creds $creds -Source $SourceName -Username $Username -pwd $pwd @@ -59,6 +68,8 @@ function AddCredential($creds, $source, $username, $pwd) { return; } + Write-Host "Inserting credential for feed: " $source + # Looks for credential configuration for the given SourceName. Create it if none is found. $sourceElement = $creds.SelectSingleNode($Source) if ($sourceElement -eq $null) @@ -91,24 +102,27 @@ function AddCredential($creds, $source, $username, $pwd) { $passwordElement.SetAttribute("value", $pwd) } -function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $pwd) { - $maestroPrivateSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]") - - Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds." - - ForEach ($PackageSource in $maestroPrivateSources) { - Write-Host "`tInserting credential for Maestro's feed:" $PackageSource.Key - AddCredential -Creds $creds -Source $PackageSource.Key -Username $Username -pwd $pwd +# Enable all darc-int package sources. +function EnableMaestroInternalPackageSources($DisabledPackageSources, $Creds) { + $maestroInternalSources = $DisabledPackageSources.SelectNodes("add[contains(@key,'darc-int')]") + ForEach ($DisabledPackageSource in $maestroInternalSources) { + EnableInternalPackageSource -DisabledPackageSources $DisabledPackageSources -Creds $Creds -PackageSourceName $DisabledPackageSource.key } } -function EnablePrivatePackageSources($DisabledPackageSources) { - $maestroPrivateSources = $DisabledPackageSources.SelectNodes("add[contains(@key,'darc-int')]") - ForEach ($DisabledPackageSource in $maestroPrivateSources) { - Write-Host "`tEnsuring private source '$($DisabledPackageSource.key)' is enabled by deleting it from disabledPackageSource" +# Enables an internal package source by name, if found. Returns true if the package source was found and enabled, false otherwise. +function EnableInternalPackageSource($DisabledPackageSources, $Creds, $PackageSourceName) { + $DisabledPackageSource = $DisabledPackageSources.SelectSingleNode("add[@key='$PackageSourceName']") + if ($DisabledPackageSource) { + Write-Host "Enabling internal source '$($DisabledPackageSource.key)'." + # Due to https://github.com/NuGet/Home/issues/10291, we must actually remove the disabled entries $DisabledPackageSources.RemoveChild($DisabledPackageSource) + + AddCredential -Creds $creds -Source $DisabledPackageSource.Key -Username $userName -pwd $Password + return $true } + return $false } if (!(Test-Path $ConfigFile -PathType Leaf)) { @@ -121,15 +135,17 @@ $doc = New-Object System.Xml.XmlDocument $filename = (Get-Item $ConfigFile).FullName $doc.Load($filename) -# Get reference to or create one if none exist already +# Get reference to - fail if none exist $sources = $doc.DocumentElement.SelectSingleNode("packageSources") if ($sources -eq $null) { - $sources = $doc.CreateElement("packageSources") - $doc.DocumentElement.AppendChild($sources) | Out-Null + Write-PipelineTelemetryError -Category 'Build' -Message "Eng/common/SetupNugetSources.ps1 returned a non-zero exit code. NuGet config file must contain a packageSources section: $ConfigFile" + ExitWithExitCode 1 } $creds = $null +$feedSuffix = "v3/index.json" if ($Password) { + $feedSuffix = "v2" # Looks for a node. Create it if none is found. $creds = $doc.DocumentElement.SelectSingleNode("packageSourceCredentials") if ($creds -eq $null) { @@ -138,33 +154,22 @@ if ($Password) { } } +$userName = "dn-bot" + # Check for disabledPackageSources; we'll enable any darc-int ones we find there $disabledSources = $doc.DocumentElement.SelectSingleNode("disabledPackageSources") if ($disabledSources -ne $null) { Write-Host "Checking for any darc-int disabled package sources in the disabledPackageSources node" - EnablePrivatePackageSources -DisabledPackageSources $disabledSources -} - -$userName = "dn-bot" - -# Insert credential nodes for Maestro's private feeds -InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -pwd $Password - -# 3.1 uses a different feed url format so it's handled differently here -$dotnet31Source = $sources.SelectSingleNode("add[@key='dotnet3.1']") -if ($dotnet31Source -ne $null) { - AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password - AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password + EnableMaestroInternalPackageSources -DisabledPackageSources $disabledSources -Creds $creds } - $dotnetVersions = @('5','6','7','8','9','10') foreach ($dotnetVersion in $dotnetVersions) { $feedPrefix = "dotnet" + $dotnetVersion; $dotnetSource = $sources.SelectSingleNode("add[@key='$feedPrefix']") if ($dotnetSource -ne $null) { - AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal/nuget/v2" -Creds $creds -Username $userName -pwd $Password - AddPackageSource -Sources $sources -SourceName "$feedPrefix-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal-transport/nuget/v2" -Creds $creds -Username $userName -pwd $Password + AddOrEnablePackageSource -Sources $sources -DisabledPackageSources $disabledSources -SourceName "$feedPrefix-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal/nuget/$feedSuffix" -Creds $creds -Username $userName -pwd $Password + AddOrEnablePackageSource -Sources $sources -DisabledPackageSources $disabledSources -SourceName "$feedPrefix-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$feedPrefix-internal-transport/nuget/$feedSuffix" -Creds $creds -Username $userName -pwd $Password } } diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index ddf4efc81a4..dd2564aef01 100755 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -52,78 +52,126 @@ if [[ `uname -s` == "Darwin" ]]; then TB='' fi -# Ensure there is a ... section. -grep -i "" $ConfigFile -if [ "$?" != "0" ]; then - echo "Adding ... section." - ConfigNodeHeader="" - PackageSourcesTemplate="${TB}${NL}${TB}" +# Enables an internal package source by name, if found. Returns 0 if found and enabled, 1 if not found. +EnableInternalPackageSource() { + local PackageSourceName="$1" + + # Check if disabledPackageSources section exists + grep -i "" "$ConfigFile" > /dev/null + if [ "$?" != "0" ]; then + return 1 # No disabled sources section + fi + + # Check if this source name is disabled + grep -i " /dev/null + if [ "$?" == "0" ]; then + echo "Enabling internal source '$PackageSourceName'." + # Remove the disabled entry + local OldDisableValue="" + local NewDisableValue="" + sed -i.bak "s|$OldDisableValue|$NewDisableValue|" "$ConfigFile" + + # Add the source name to PackageSources for credential handling + PackageSources+=("$PackageSourceName") + return 0 # Found and enabled + fi + + return 1 # Not found in disabled sources +} + +# Add source entry to PackageSources +AddPackageSource() { + local SourceName="$1" + local SourceEndPoint="$2" + + # Check if source already exists + grep -i " /dev/null + if [ "$?" == "0" ]; then + echo "Package source $SourceName already present and enabled." + PackageSources+=("$SourceName") + return + fi + + echo "Adding package source $SourceName" + PackageSourcesNodeFooter="" + PackageSourceTemplate="${TB}" + + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" "$ConfigFile" + PackageSources+=("$SourceName") +} + +# Adds or enables the package source with the given name +AddOrEnablePackageSource() { + local SourceName="$1" + local SourceEndPoint="$2" + + # Try to enable if disabled, if not found then add new source + EnableInternalPackageSource "$SourceName" + if [ "$?" != "0" ]; then + AddPackageSource "$SourceName" "$SourceEndPoint" + fi +} - sed -i.bak "s|$ConfigNodeHeader|$ConfigNodeHeader${NL}$PackageSourcesTemplate|" $ConfigFile -fi +# Enable all darc-int package sources +EnableMaestroInternalPackageSources() { + # Check if disabledPackageSources section exists + grep -i "" "$ConfigFile" > /dev/null + if [ "$?" != "0" ]; then + return # No disabled sources section + fi + + # Find all darc-int disabled sources + local DisabledDarcIntSources=() + DisabledDarcIntSources+=$(grep -oh '"darc-int-[^"]*" value="true"' "$ConfigFile" | tr -d '"') + + for DisabledSourceName in ${DisabledDarcIntSources[@]} ; do + if [[ $DisabledSourceName == darc-int* ]]; then + EnableInternalPackageSource "$DisabledSourceName" + fi + done +} -# Ensure there is a ... section. -grep -i "" $ConfigFile +# Ensure there is a ... section. +grep -i "" $ConfigFile if [ "$?" != "0" ]; then - echo "Adding ... section." - - PackageSourcesNodeFooter="" - PackageSourceCredentialsTemplate="${TB}${NL}${TB}" - - sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourcesNodeFooter${NL}$PackageSourceCredentialsTemplate|" $ConfigFile + Write-PipelineTelemetryError -Category 'Build' "Error: Eng/common/SetupNugetSources.sh returned a non-zero exit code. NuGet config file must contain a packageSources section: $ConfigFile" + ExitWithExitCode 1 fi PackageSources=() -# Ensure dotnet3.1-internal and dotnet3.1-internal-transport are in the packageSources if the public dotnet3.1 feeds are present -grep -i "... section. + grep -i "" $ConfigFile if [ "$?" != "0" ]; then - echo "Adding dotnet3.1-internal to the packageSources." - PackageSourcesNodeFooter="" - PackageSourceTemplate="${TB}" + echo "Adding ... section." - sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile - fi - PackageSources+=('dotnet3.1-internal') - - grep -i "" $ConfigFile - if [ "$?" != "0" ]; then - echo "Adding dotnet3.1-internal-transport to the packageSources." PackageSourcesNodeFooter="" - PackageSourceTemplate="${TB}" + PackageSourceCredentialsTemplate="${TB}${NL}${TB}" - sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile + sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourcesNodeFooter${NL}$PackageSourceCredentialsTemplate|" $ConfigFile fi - PackageSources+=('dotnet3.1-internal-transport') +fi + +# Check for disabledPackageSources; we'll enable any darc-int ones we find there +grep -i "" $ConfigFile > /dev/null +if [ "$?" == "0" ]; then + echo "Checking for any darc-int disabled package sources in the disabledPackageSources node" + EnableMaestroInternalPackageSources fi DotNetVersions=('5' '6' '7' '8' '9' '10') for DotNetVersion in ${DotNetVersions[@]} ; do FeedPrefix="dotnet${DotNetVersion}"; - grep -i " /dev/null if [ "$?" == "0" ]; then - grep -i "" - - sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile - fi - PackageSources+=("$FeedPrefix-internal") - - grep -i "" $ConfigFile - if [ "$?" != "0" ]; then - echo "Adding $FeedPrefix-internal-transport to the packageSources." - PackageSourcesNodeFooter="" - PackageSourceTemplate="${TB}" - - sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile - fi - PackageSources+=("$FeedPrefix-internal-transport") + AddOrEnablePackageSource "$FeedPrefix-internal" "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$FeedPrefix-internal/nuget/$FeedSuffix" + AddOrEnablePackageSource "$FeedPrefix-internal-transport" "https://pkgs.dev.azure.com/dnceng/internal/_packaging/$FeedPrefix-internal-transport/nuget/$FeedSuffix" fi done @@ -139,29 +187,12 @@ if [ "$CredToken" ]; then # Check if there is no existing credential for this FeedName grep -i "<$FeedName>" $ConfigFile if [ "$?" != "0" ]; then - echo "Adding credentials for $FeedName." + echo " Inserting credential for feed: $FeedName" PackageSourceCredentialsNodeFooter="" - NewCredential="${TB}${TB}<$FeedName>${NL}${NL}${NL}" + NewCredential="${TB}${TB}<$FeedName>${NL}${TB}${NL}${TB}${TB}${NL}${TB}${TB}" sed -i.bak "s|$PackageSourceCredentialsNodeFooter|$NewCredential${NL}$PackageSourceCredentialsNodeFooter|" $ConfigFile fi done fi - -# Re-enable any entries in disabledPackageSources where the feed name contains darc-int -grep -i "" $ConfigFile -if [ "$?" == "0" ]; then - DisabledDarcIntSources=() - echo "Re-enabling any disabled \"darc-int\" package sources in $ConfigFile" - DisabledDarcIntSources+=$(grep -oh '"darc-int-[^"]*" value="true"' $ConfigFile | tr -d '"') - for DisabledSourceName in ${DisabledDarcIntSources[@]} ; do - if [[ $DisabledSourceName == darc-int* ]] - then - OldDisableValue="" - NewDisableValue="" - sed -i.bak "s|$OldDisableValue|$NewDisableValue|" $ConfigFile - echo "Neutralized disablePackageSources entry for '$DisabledSourceName'" - fi - done -fi diff --git a/global.json b/global.json index 8f5e37d4c72..6968ab7e58a 100644 --- a/global.json +++ b/global.json @@ -24,8 +24,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25507.103", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25507.103", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25512.102", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25512.102", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": { From 0b4e4849644a0daa3fd2f167941ad29aed77463f Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 14 Oct 2025 10:50:52 +0530 Subject: [PATCH 6/9] Update dependencies from https://github.com/dotnet/dotnet build 286841 (#11172) Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25512.102 -> 10.0.0-beta.25513.102) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.CodeDom, System.Configuration.ConfigurationManager, System.Diagnostics.EventLog, System.DirectoryServices, System.Drawing.Common, System.Formats.Nrbf, System.IO.Packaging, System.Private.Windows.Core.TestUtilities, System.Reflection.MetadataLoadContext, System.Resources.Extensions, System.Runtime.Serialization.Formatters, System.Security.Cryptography.Xml, System.Security.Permissions, System.Windows.Extensions (Version 10.0.0-rtm.25512.102 -> 10.0.0-rtm.25513.102) Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.props | 44 +++++++++---------- eng/Version.Details.xml | 90 +++++++++++++++++++-------------------- global.json | 4 +- 3 files changed, 69 insertions(+), 69 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 0068ab7bb5f..a601b08f1c1 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.25512.102 - 10.0.0-beta.25512.102 - 10.0.0-beta.25512.102 - 10.0.0-beta.25512.102 - 10.0.0-rtm.25512.102 - 10.0.0-rtm.25512.102 - 10.0.0-rtm.25512.102 - 10.0.0-rtm.25512.102 + 10.0.0-beta.25513.102 + 10.0.0-beta.25513.102 + 10.0.0-beta.25513.102 + 10.0.0-beta.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 8.0.0-beta.23409.2 8.0.0-beta.23409.2 - 10.0.0-rtm.25512.102 - 10.0.0-rtm.25512.102 - 10.0.0-rtm.25512.102 - 10.0.0-rtm.25512.102 - 10.0.0-rtm.25512.102 - 10.0.0-rtm.25512.102 - 10.0.0-rtm.25512.102 - 10.0.0-rtm.25512.102 - 10.0.0-rtm.25512.102 - 10.0.0-rtm.25512.102 - 10.0.0-rtm.25512.102 - 10.0.0-rtm.25512.102 - 10.0.0-rtm.25512.102 - 10.0.0-rtm.25512.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 + 10.0.0-rtm.25513.102 10.0.0-rc.2.25474.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 418ddb064c4..dba107c74c4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,78 +1,78 @@ - + - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 544137fb099e0aa4864a49fcea9700e44897ab46 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 https://github.com/dotnet/dotnet @@ -84,25 +84,25 @@ - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://github.com/dotnet/dotnet - 0b60d265d30d96c827b73dbce74cb78f600d3c92 + b502b6eeec0db06720ead7fd9570befa39a6b2f7 diff --git a/global.json b/global.json index 6968ab7e58a..7d0d11b6c07 100644 --- a/global.json +++ b/global.json @@ -24,8 +24,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25512.102", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25512.102", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25513.102", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25513.102", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": { From 47f516ce923572c330977c6f6d38fc3935617646 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 14 Oct 2025 10:59:17 +0530 Subject: [PATCH 7/9] Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20251013.4 (#11175) On relative base path root Microsoft.DotNet.Wpf.DncEng From Version 10.0.0-rc.2.25474.1 -> To Version 10.0.0-rtm.25513.4 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.props | 2 +- eng/Version.Details.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.props b/eng/Version.Details.props index a601b08f1c1..e7912178d5b 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -33,7 +33,7 @@ This file should be imported by eng/Versions.props 10.0.0-rtm.25513.102 10.0.0-rtm.25513.102 - 10.0.0-rc.2.25474.1 + 10.0.0-rtm.25513.4 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index dba107c74c4..fe4aceda477 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -22,9 +22,9 @@ https://github.com/dotnet/dotnet b502b6eeec0db06720ead7fd9570befa39a6b2f7 - + https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int - 544137fb099e0aa4864a49fcea9700e44897ab46 + bbb14872ef0b8cdc8c2ebcd4f19f78024d5f560c https://github.com/dotnet/dotnet From 8409237906c778eeb16662b444a24b46a07a0976 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 16 Oct 2025 11:02:47 +0530 Subject: [PATCH 8/9] [release/10.0] Source code updates from dotnet/dotnet (#11189) * Update dependencies from https://github.com/dotnet/dotnet build 287070 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25513.102 -> 10.0.0-beta.25514.103) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.Private.Windows.Core.TestUtilities (Version 10.0.0-rtm.25513.102 -> 10.0.0-rtm.25514.103) 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.0-rtm.25513.102 -> 10.0.0) * Backflow from https://github.com/dotnet/dotnet / 03ebd38 build 287340 [[ commit created by automation ]] * Update dependencies from https://github.com/dotnet/dotnet build 287340 Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25514.103 -> 10.0.0-beta.25515.107) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.Private.Windows.Core.TestUtilities (Version 10.0.0-rtm.25514.103 -> 10.0.0-rtm.25515.107) 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.0 -> 10.0.0) --------- Co-authored-by: dotnet-maestro[bot] --- NuGet.config | 5 ++ eng/Version.Details.props | 44 ++++++++-------- eng/Version.Details.xml | 90 ++++++++++++++++----------------- eng/Versions.props | 2 +- eng/common/SetupNugetSources.sh | 6 +-- global.json | 4 +- 6 files changed, 77 insertions(+), 74 deletions(-) diff --git a/NuGet.config b/NuGet.config index f70711a2ac0..41ae1d0f573 100644 --- a/NuGet.config +++ b/NuGet.config @@ -3,6 +3,11 @@ + + + + + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index e7912178d5b..e338109fb12 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.25513.102 - 10.0.0-beta.25513.102 - 10.0.0-beta.25513.102 - 10.0.0-beta.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 + 10.0.0-beta.25515.107 + 10.0.0-beta.25515.107 + 10.0.0-beta.25515.107 + 10.0.0-beta.25515.107 + 10.0.0-rtm.25515.107 + 10.0.0 + 10.0.0-rtm.25515.107 + 10.0.0-rtm.25515.107 8.0.0-beta.23409.2 8.0.0-beta.23409.2 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 - 10.0.0-rtm.25513.102 + 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.25515.107 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 + 10.0.0 10.0.0-rtm.25513.4 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fe4aceda477..3679aed3250 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,78 +1,78 @@ - + - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int bbb14872ef0b8cdc8c2ebcd4f19f78024d5f560c - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e https://github.com/dotnet/dotnet @@ -84,25 +84,25 @@ - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e - + https://github.com/dotnet/dotnet - b502b6eeec0db06720ead7fd9570befa39a6b2f7 + 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e diff --git a/eng/Versions.props b/eng/Versions.props index 8a6e7ffea3e..13b5b13739e 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -31,7 +31,7 @@ - 10.0.0-preview-20250912.1 + 10.0.0-preview-20251006.1 diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh index dd2564aef01..b97cc536379 100755 --- a/eng/common/SetupNugetSources.sh +++ b/eng/common/SetupNugetSources.sh @@ -66,10 +66,8 @@ EnableInternalPackageSource() { grep -i " /dev/null if [ "$?" == "0" ]; then echo "Enabling internal source '$PackageSourceName'." - # Remove the disabled entry - local OldDisableValue="" - local NewDisableValue="" - sed -i.bak "s|$OldDisableValue|$NewDisableValue|" "$ConfigFile" + # Remove the disabled entry (including any surrounding comments or whitespace on the same line) + sed -i.bak "//d" "$ConfigFile" # Add the source name to PackageSources for credential handling PackageSources+=("$PackageSourceName") diff --git a/global.json b/global.json index 7d0d11b6c07..208f9327e6a 100644 --- a/global.json +++ b/global.json @@ -24,8 +24,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25513.102", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25513.102", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25515.107", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25515.107", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": { From 72ca82c7a0f57eb8d0168246468b9cc1a6c14a5a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 21 Oct 2025 10:54:37 +0530 Subject: [PATCH 9/9] Update dependencies from https://github.com/dotnet/dotnet build 287426 (#11197) Updated Dependencies: Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.Helix.Sdk (Version 10.0.0-beta.25515.107 -> 10.0.0-beta.25515.111) Microsoft.Dotnet.WinForms.ProjectTemplates, Microsoft.NETCore.Platforms, Microsoft.Private.Winforms, System.Private.Windows.Core.TestUtilities (Version 10.0.0-rtm.25515.107 -> 10.0.0-rtm.25515.111) 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.0 -> 10.0.0) Co-authored-by: dotnet-maestro[bot] --- 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 41ae1d0f573..14630ed504a 100644 --- a/NuGet.config +++ b/NuGet.config @@ -5,7 +5,7 @@ - + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index e338109fb12..c7c6ecf631c 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.25515.107 - 10.0.0-beta.25515.107 - 10.0.0-beta.25515.107 - 10.0.0-beta.25515.107 - 10.0.0-rtm.25515.107 + 10.0.0-beta.25515.111 + 10.0.0-beta.25515.111 + 10.0.0-beta.25515.111 + 10.0.0-beta.25515.111 + 10.0.0-rtm.25515.111 10.0.0 - 10.0.0-rtm.25515.107 - 10.0.0-rtm.25515.107 + 10.0.0-rtm.25515.111 + 10.0.0-rtm.25515.111 8.0.0-beta.23409.2 8.0.0-beta.23409.2 10.0.0 @@ -25,7 +25,7 @@ This file should be imported by eng/Versions.props 10.0.0 10.0.0 10.0.0 - 10.0.0-rtm.25515.107 + 10.0.0-rtm.25515.111 10.0.0 10.0.0 10.0.0 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3679aed3250..acc1eb010e9 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,26 +1,26 @@ - + - + https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 - + https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 - + https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int @@ -28,51 +28,51 @@ https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 https://github.com/dotnet/dotnet @@ -84,25 +84,25 @@ - + https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 - + https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 - + https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 - + https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 - + https://github.com/dotnet/dotnet - 03ebd38e3fd6b1068f44b5e4c560ad891c2b412e + 79c85d969a02abd06c2202949318fd4c21e5e7a0 diff --git a/global.json b/global.json index 208f9327e6a..c80ba78e476 100644 --- a/global.json +++ b/global.json @@ -24,8 +24,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25515.107", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25515.107", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25515.111", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25515.111", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": {