From 914c5deeb967c9696a1492a42d9795df29b5cd0a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 27 Apr 2026 05:56:42 +0000 Subject: [PATCH 01/14] Update dependencies from https://github.com/dotnet/arcade build 20260423.2 (#38170) [release/9.0] Update dependencies from dotnet/arcade --- NuGet.config | 2 -- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 8 ++++---- 4 files changed, 11 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index 489bf4370f7..d1a8a417e43 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,6 @@ - @@ -21,7 +20,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c09a5aaa0af..e56561b806c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -67,17 +67,17 @@ - + https://github.com/dotnet/arcade - e1240639569fad610705b52713d6d6b19f8fe433 + 33235aeaaa886866a388926dc6d5d0e8b789aaaa - + https://github.com/dotnet/arcade - e1240639569fad610705b52713d6d6b19f8fe433 + 33235aeaaa886866a388926dc6d5d0e8b789aaaa - + https://github.com/dotnet/arcade - e1240639569fad610705b52713d6d6b19f8fe433 + 33235aeaaa886866a388926dc6d5d0e8b789aaaa diff --git a/eng/Versions.props b/eng/Versions.props index e0b126609ce..abfc2c65a83 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -34,7 +34,7 @@ 9.0.15 - 9.0.0-beta.26201.6 + 9.0.0-beta.26223.2 17.8.43 diff --git a/global.json b/global.json index 5b3bcffb8b4..87567bbdee8 100644 --- a/global.json +++ b/global.json @@ -1,11 +1,11 @@ { "sdk": { - "version": "9.0.115", + "version": "9.0.116", "allowPrerelease": true, "rollForward": "latestMajor" }, "tools": { - "dotnet": "9.0.115", + "dotnet": "9.0.116", "runtimes": { "dotnet": [ "$(MicrosoftNETCoreBrowserDebugHostTransportVersion)" @@ -13,7 +13,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.26201.6", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.26201.6" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.26223.2", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.26223.2" } } From a5607a4b6a47d7e7613085b004ad57981be4e142 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 30 Apr 2026 22:54:58 +0000 Subject: [PATCH 02/14] Merge pull request #38189 from dotnet/darc-release/10.0-92bd36de-c112-4a1a-bd34-d64bbc8c231f [release/10.0] Source code updates from dotnet/dotnet --- NuGet.config | 2 +- eng/Version.Details.props | 36 ++++----- eng/Version.Details.xml | 74 +++++++++---------- eng/Versions.props | 2 +- global.json | 8 +- .../ChangeTracking/Internal/ChangeDetector.cs | 2 +- .../Internal/InternalComplexTypeBuilder.cs | 2 +- .../Internal/ExpressionTreeFuncletizer.cs | 2 +- 8 files changed, 64 insertions(+), 64 deletions(-) diff --git a/NuGet.config b/NuGet.config index e9a0c968c64..3aa384448a7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 2b1ab07a695..96380c4927d 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,24 +6,24 @@ This file should be imported by eng/Versions.props - 10.0.0-beta.26217.115 - 10.0.0-beta.26217.115 - 10.0.0-beta.26217.115 - 10.0.8 - 10.0.8 - 10.0.8 - 10.0.8 - 10.0.8 - 10.0.8 - 10.0.8 - 10.0.8-servicing.26217.115 - 10.0.8 - 10.0.8 - 10.0.8-servicing.26217.115 - 10.0.8 - 10.0.8 - 10.0.8 - 10.0.8 + 10.0.0-beta.26230.105 + 10.0.0-beta.26230.105 + 10.0.0-beta.26230.105 + 10.0.9 + 10.0.9 + 10.0.9 + 10.0.9 + 10.0.9 + 10.0.9 + 10.0.9 + 10.0.9-servicing.26230.105 + 10.0.9 + 10.0.9 + 10.0.9-servicing.26230.105 + 10.0.9 + 10.0.9 + 10.0.9 + 10.0.9 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cfd98161757..4a1d394889d 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,80 +1,80 @@ - + - + https://github.com/dotnet/dotnet - 71d1809a66d8aacbe21208baeb0bbc484191b3d1 + c7f1e00d178d0803482a25106a6de6b8f0babd11 - + https://github.com/dotnet/dotnet - 71d1809a66d8aacbe21208baeb0bbc484191b3d1 + c7f1e00d178d0803482a25106a6de6b8f0babd11 - + https://github.com/dotnet/dotnet - 71d1809a66d8aacbe21208baeb0bbc484191b3d1 + c7f1e00d178d0803482a25106a6de6b8f0babd11 - + https://github.com/dotnet/dotnet - 71d1809a66d8aacbe21208baeb0bbc484191b3d1 + c7f1e00d178d0803482a25106a6de6b8f0babd11 - + https://github.com/dotnet/dotnet - 71d1809a66d8aacbe21208baeb0bbc484191b3d1 + c7f1e00d178d0803482a25106a6de6b8f0babd11 - + https://github.com/dotnet/dotnet - 71d1809a66d8aacbe21208baeb0bbc484191b3d1 + c7f1e00d178d0803482a25106a6de6b8f0babd11 - + https://github.com/dotnet/dotnet - 71d1809a66d8aacbe21208baeb0bbc484191b3d1 + c7f1e00d178d0803482a25106a6de6b8f0babd11 - + https://github.com/dotnet/dotnet - 71d1809a66d8aacbe21208baeb0bbc484191b3d1 + c7f1e00d178d0803482a25106a6de6b8f0babd11 - + https://github.com/dotnet/dotnet - 71d1809a66d8aacbe21208baeb0bbc484191b3d1 + c7f1e00d178d0803482a25106a6de6b8f0babd11 - + https://github.com/dotnet/dotnet - 71d1809a66d8aacbe21208baeb0bbc484191b3d1 + c7f1e00d178d0803482a25106a6de6b8f0babd11 - + https://github.com/dotnet/dotnet - 71d1809a66d8aacbe21208baeb0bbc484191b3d1 + c7f1e00d178d0803482a25106a6de6b8f0babd11 - + https://github.com/dotnet/dotnet - 71d1809a66d8aacbe21208baeb0bbc484191b3d1 + c7f1e00d178d0803482a25106a6de6b8f0babd11 - + https://github.com/dotnet/dotnet - 71d1809a66d8aacbe21208baeb0bbc484191b3d1 + c7f1e00d178d0803482a25106a6de6b8f0babd11 - + https://github.com/dotnet/dotnet - 71d1809a66d8aacbe21208baeb0bbc484191b3d1 + c7f1e00d178d0803482a25106a6de6b8f0babd11 - + https://github.com/dotnet/dotnet - 71d1809a66d8aacbe21208baeb0bbc484191b3d1 + c7f1e00d178d0803482a25106a6de6b8f0babd11 - + https://github.com/dotnet/dotnet - 71d1809a66d8aacbe21208baeb0bbc484191b3d1 + c7f1e00d178d0803482a25106a6de6b8f0babd11 - + https://github.com/dotnet/dotnet - 71d1809a66d8aacbe21208baeb0bbc484191b3d1 + c7f1e00d178d0803482a25106a6de6b8f0babd11 - + https://github.com/dotnet/dotnet - 71d1809a66d8aacbe21208baeb0bbc484191b3d1 + c7f1e00d178d0803482a25106a6de6b8f0babd11 diff --git a/eng/Versions.props b/eng/Versions.props index 3696a265b6d..92b16e95f7c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,7 +1,7 @@ - 10.0.8 + 10.0.9 servicing False diff --git a/global.json b/global.json index 03f2aa1277f..3490dbebb71 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "10.0.106", + "version": "10.0.107", "allowPrerelease": true, "rollForward": "latestMajor", "paths": [ @@ -10,7 +10,7 @@ "errorMessage": "The required .NET SDK wasn't found. Please run ./restore.sh or .\\restore.cmd to install it." }, "tools": { - "dotnet": "10.0.106", + "dotnet": "10.0.107", "runtimes": { "dotnet": [ "$(MicrosoftNETCorePlatformsVersion)" @@ -18,7 +18,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26217.115", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26217.115" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26230.105", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26230.105" } } diff --git a/src/EFCore/ChangeTracking/Internal/ChangeDetector.cs b/src/EFCore/ChangeTracking/Internal/ChangeDetector.cs index d3f23016795..c371b7a2a0d 100644 --- a/src/EFCore/ChangeTracking/Internal/ChangeDetector.cs +++ b/src/EFCore/ChangeTracking/Internal/ChangeDetector.cs @@ -1176,4 +1176,4 @@ public virtual void ResetState() DetectingAllChanges = null; DetectedAllChanges = null; } -} +} \ No newline at end of file diff --git a/src/EFCore/Metadata/Internal/InternalComplexTypeBuilder.cs b/src/EFCore/Metadata/Internal/InternalComplexTypeBuilder.cs index ff79ac03542..2a93ac570dd 100644 --- a/src/EFCore/Metadata/Internal/InternalComplexTypeBuilder.cs +++ b/src/EFCore/Metadata/Internal/InternalComplexTypeBuilder.cs @@ -765,4 +765,4 @@ IConventionComplexTypeBuilder IConventionComplexTypeBuilder.RemoveUnusedImplicit [DebuggerStepThrough] public IConventionComplexTypeBuilder? HasNoDiscriminator(bool fromDataAnnotation = false) => HasNoDiscriminator(fromDataAnnotation ? ConfigurationSource.DataAnnotation : ConfigurationSource.Convention); -} +} \ No newline at end of file diff --git a/src/EFCore/Query/Internal/ExpressionTreeFuncletizer.cs b/src/EFCore/Query/Internal/ExpressionTreeFuncletizer.cs index 39759f5b6ec..4c07cc883c8 100644 --- a/src/EFCore/Query/Internal/ExpressionTreeFuncletizer.cs +++ b/src/EFCore/Query/Internal/ExpressionTreeFuncletizer.cs @@ -2431,4 +2431,4 @@ private sealed class ContextParameterReplacer(Type contextType) : ExpressionVisi ? ContextParameterExpression : base.Visit(expression); } -} +} \ No newline at end of file From 15ce2273101c76b3dd9c2fd53cce7faa4be9c5a7 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 1 May 2026 05:47:27 +0000 Subject: [PATCH 03/14] Update dependencies from https://github.com/dotnet/arcade build 20260424.3 (#38204) [release/8.0] Update dependencies from dotnet/arcade --- NuGet.config | 2 -- eng/Version.Details.xml | 12 ++++++------ eng/Versions.props | 2 +- global.json | 8 ++++---- 4 files changed, 11 insertions(+), 13 deletions(-) diff --git a/NuGet.config b/NuGet.config index eaef3554ceb..77b2bf048ad 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,6 @@ - @@ -19,7 +18,6 @@ - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0918f92d213..266190cf371 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -60,17 +60,17 @@ - + https://github.com/dotnet/arcade - 8dabb7110e0c0e8ca9866f389493bfb5047b8c24 + d9af20b993c474033098fe0851c2d71b4ecf434b - + https://github.com/dotnet/arcade - 8dabb7110e0c0e8ca9866f389493bfb5047b8c24 + d9af20b993c474033098fe0851c2d71b4ecf434b - + https://github.com/dotnet/arcade - 8dabb7110e0c0e8ca9866f389493bfb5047b8c24 + d9af20b993c474033098fe0851c2d71b4ecf434b diff --git a/eng/Versions.props b/eng/Versions.props index 42036dc74ff..3b2484ef9cd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -33,7 +33,7 @@ 8.0.26-servicing.26169.21 - 8.0.0-beta.26168.3 + 8.0.0-beta.26224.3 diff --git a/global.json b/global.json index 55aa62458e1..7054542252a 100644 --- a/global.json +++ b/global.json @@ -1,11 +1,11 @@ { "sdk": { - "version": "8.0.125", + "version": "8.0.126", "allowPrerelease": true, "rollForward": "latestMajor" }, "tools": { - "dotnet": "8.0.125", + "dotnet": "8.0.126", "runtimes": { "dotnet": [ "$(MicrosoftNETCoreBrowserDebugHostTransportVersion)" @@ -13,7 +13,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.26168.3", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.26168.3" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.26224.3", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.26224.3" } } From b499d72bb6a97826ff5aa8b5ae4180250a09c8ec Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 1 May 2026 21:15:58 +0000 Subject: [PATCH 04/14] Update dependencies from build 312762 (#38209) [release/10.0] Source code updates from dotnet/dotnet --- NuGet.config | 2 +- eng/Version.Details.props | 10 ++++---- eng/Version.Details.xml | 48 +++++++++++++++++++-------------------- global.json | 4 ++-- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/NuGet.config b/NuGet.config index 3aa384448a7..7aea21dad37 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 96380c4927d..876f69a906a 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,9 +6,9 @@ This file should be imported by eng/Versions.props - 10.0.0-beta.26230.105 - 10.0.0-beta.26230.105 - 10.0.0-beta.26230.105 + 10.0.0-beta.26251.102 + 10.0.0-beta.26251.102 + 10.0.0-beta.26251.102 10.0.9 10.0.9 10.0.9 @@ -16,10 +16,10 @@ This file should be imported by eng/Versions.props 10.0.9 10.0.9 10.0.9 - 10.0.9-servicing.26230.105 + 10.0.9-servicing.26251.102 10.0.9 10.0.9 - 10.0.9-servicing.26230.105 + 10.0.9-servicing.26251.102 10.0.9 10.0.9 10.0.9 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4a1d394889d..ca5d2a71313 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,80 +1,80 @@ - + https://github.com/dotnet/dotnet - c7f1e00d178d0803482a25106a6de6b8f0babd11 + 2bf7671be038f80125428641fc3cb0d22af0a4bc https://github.com/dotnet/dotnet - c7f1e00d178d0803482a25106a6de6b8f0babd11 + 2bf7671be038f80125428641fc3cb0d22af0a4bc https://github.com/dotnet/dotnet - c7f1e00d178d0803482a25106a6de6b8f0babd11 + 2bf7671be038f80125428641fc3cb0d22af0a4bc https://github.com/dotnet/dotnet - c7f1e00d178d0803482a25106a6de6b8f0babd11 + 2bf7671be038f80125428641fc3cb0d22af0a4bc https://github.com/dotnet/dotnet - c7f1e00d178d0803482a25106a6de6b8f0babd11 + 2bf7671be038f80125428641fc3cb0d22af0a4bc https://github.com/dotnet/dotnet - c7f1e00d178d0803482a25106a6de6b8f0babd11 + 2bf7671be038f80125428641fc3cb0d22af0a4bc https://github.com/dotnet/dotnet - c7f1e00d178d0803482a25106a6de6b8f0babd11 + 2bf7671be038f80125428641fc3cb0d22af0a4bc - + https://github.com/dotnet/dotnet - c7f1e00d178d0803482a25106a6de6b8f0babd11 + 2bf7671be038f80125428641fc3cb0d22af0a4bc https://github.com/dotnet/dotnet - c7f1e00d178d0803482a25106a6de6b8f0babd11 + 2bf7671be038f80125428641fc3cb0d22af0a4bc https://github.com/dotnet/dotnet - c7f1e00d178d0803482a25106a6de6b8f0babd11 + 2bf7671be038f80125428641fc3cb0d22af0a4bc - + https://github.com/dotnet/dotnet - c7f1e00d178d0803482a25106a6de6b8f0babd11 + 2bf7671be038f80125428641fc3cb0d22af0a4bc https://github.com/dotnet/dotnet - c7f1e00d178d0803482a25106a6de6b8f0babd11 + 2bf7671be038f80125428641fc3cb0d22af0a4bc https://github.com/dotnet/dotnet - c7f1e00d178d0803482a25106a6de6b8f0babd11 + 2bf7671be038f80125428641fc3cb0d22af0a4bc https://github.com/dotnet/dotnet - c7f1e00d178d0803482a25106a6de6b8f0babd11 + 2bf7671be038f80125428641fc3cb0d22af0a4bc https://github.com/dotnet/dotnet - c7f1e00d178d0803482a25106a6de6b8f0babd11 + 2bf7671be038f80125428641fc3cb0d22af0a4bc - + https://github.com/dotnet/dotnet - c7f1e00d178d0803482a25106a6de6b8f0babd11 + 2bf7671be038f80125428641fc3cb0d22af0a4bc - + https://github.com/dotnet/dotnet - c7f1e00d178d0803482a25106a6de6b8f0babd11 + 2bf7671be038f80125428641fc3cb0d22af0a4bc - + https://github.com/dotnet/dotnet - c7f1e00d178d0803482a25106a6de6b8f0babd11 + 2bf7671be038f80125428641fc3cb0d22af0a4bc diff --git a/global.json b/global.json index 3490dbebb71..94cca23e60a 100644 --- a/global.json +++ b/global.json @@ -18,7 +18,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26230.105", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26230.105" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26251.102", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26251.102" } } From a57c937ecaa0bfe8f59adcda0a571e82790fb0ea Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 2 May 2026 03:56:32 +0000 Subject: [PATCH 05/14] Update dependencies from build 312795 (#38213) [release/10.0] Source code updates from dotnet/dotnet --- NuGet.config | 2 +- eng/Version.Details.props | 10 ++++---- eng/Version.Details.xml | 48 +++++++++++++++++++-------------------- global.json | 4 ++-- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/NuGet.config b/NuGet.config index 7aea21dad37..e758a6161fe 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 876f69a906a..224b37ab93a 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,9 +6,9 @@ This file should be imported by eng/Versions.props - 10.0.0-beta.26251.102 - 10.0.0-beta.26251.102 - 10.0.0-beta.26251.102 + 10.0.0-beta.26251.106 + 10.0.0-beta.26251.106 + 10.0.0-beta.26251.106 10.0.9 10.0.9 10.0.9 @@ -16,10 +16,10 @@ This file should be imported by eng/Versions.props 10.0.9 10.0.9 10.0.9 - 10.0.9-servicing.26251.102 + 10.0.9-servicing.26251.106 10.0.9 10.0.9 - 10.0.9-servicing.26251.102 + 10.0.9-servicing.26251.106 10.0.9 10.0.9 10.0.9 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ca5d2a71313..f803b88c65c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,80 +1,80 @@ - + https://github.com/dotnet/dotnet - 2bf7671be038f80125428641fc3cb0d22af0a4bc + 5e531f538e1395bf9f93e03db04e8411a40bd9f9 https://github.com/dotnet/dotnet - 2bf7671be038f80125428641fc3cb0d22af0a4bc + 5e531f538e1395bf9f93e03db04e8411a40bd9f9 https://github.com/dotnet/dotnet - 2bf7671be038f80125428641fc3cb0d22af0a4bc + 5e531f538e1395bf9f93e03db04e8411a40bd9f9 https://github.com/dotnet/dotnet - 2bf7671be038f80125428641fc3cb0d22af0a4bc + 5e531f538e1395bf9f93e03db04e8411a40bd9f9 https://github.com/dotnet/dotnet - 2bf7671be038f80125428641fc3cb0d22af0a4bc + 5e531f538e1395bf9f93e03db04e8411a40bd9f9 https://github.com/dotnet/dotnet - 2bf7671be038f80125428641fc3cb0d22af0a4bc + 5e531f538e1395bf9f93e03db04e8411a40bd9f9 https://github.com/dotnet/dotnet - 2bf7671be038f80125428641fc3cb0d22af0a4bc + 5e531f538e1395bf9f93e03db04e8411a40bd9f9 - + https://github.com/dotnet/dotnet - 2bf7671be038f80125428641fc3cb0d22af0a4bc + 5e531f538e1395bf9f93e03db04e8411a40bd9f9 https://github.com/dotnet/dotnet - 2bf7671be038f80125428641fc3cb0d22af0a4bc + 5e531f538e1395bf9f93e03db04e8411a40bd9f9 https://github.com/dotnet/dotnet - 2bf7671be038f80125428641fc3cb0d22af0a4bc + 5e531f538e1395bf9f93e03db04e8411a40bd9f9 - + https://github.com/dotnet/dotnet - 2bf7671be038f80125428641fc3cb0d22af0a4bc + 5e531f538e1395bf9f93e03db04e8411a40bd9f9 https://github.com/dotnet/dotnet - 2bf7671be038f80125428641fc3cb0d22af0a4bc + 5e531f538e1395bf9f93e03db04e8411a40bd9f9 https://github.com/dotnet/dotnet - 2bf7671be038f80125428641fc3cb0d22af0a4bc + 5e531f538e1395bf9f93e03db04e8411a40bd9f9 https://github.com/dotnet/dotnet - 2bf7671be038f80125428641fc3cb0d22af0a4bc + 5e531f538e1395bf9f93e03db04e8411a40bd9f9 https://github.com/dotnet/dotnet - 2bf7671be038f80125428641fc3cb0d22af0a4bc + 5e531f538e1395bf9f93e03db04e8411a40bd9f9 - + https://github.com/dotnet/dotnet - 2bf7671be038f80125428641fc3cb0d22af0a4bc + 5e531f538e1395bf9f93e03db04e8411a40bd9f9 - + https://github.com/dotnet/dotnet - 2bf7671be038f80125428641fc3cb0d22af0a4bc + 5e531f538e1395bf9f93e03db04e8411a40bd9f9 - + https://github.com/dotnet/dotnet - 2bf7671be038f80125428641fc3cb0d22af0a4bc + 5e531f538e1395bf9f93e03db04e8411a40bd9f9 diff --git a/global.json b/global.json index 94cca23e60a..d7a7e7130e0 100644 --- a/global.json +++ b/global.json @@ -18,7 +18,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26251.102", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26251.102" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26251.106", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26251.106" } } From dd0ff4b7cd90749db048b4da2aed9a34879c61fd Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sun, 3 May 2026 04:55:43 +0000 Subject: [PATCH 06/14] Update dependencies from build 312829 (#38216) [release/10.0] Source code updates from dotnet/dotnet --- NuGet.config | 2 +- eng/Version.Details.props | 10 ++++---- eng/Version.Details.xml | 48 +++++++++++++++++++-------------------- global.json | 4 ++-- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/NuGet.config b/NuGet.config index e758a6161fe..2cb62ad62b2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 224b37ab93a..df485de330a 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,9 +6,9 @@ This file should be imported by eng/Versions.props - 10.0.0-beta.26251.106 - 10.0.0-beta.26251.106 - 10.0.0-beta.26251.106 + 10.0.0-beta.26252.101 + 10.0.0-beta.26252.101 + 10.0.0-beta.26252.101 10.0.9 10.0.9 10.0.9 @@ -16,10 +16,10 @@ This file should be imported by eng/Versions.props 10.0.9 10.0.9 10.0.9 - 10.0.9-servicing.26251.106 + 10.0.9-servicing.26252.101 10.0.9 10.0.9 - 10.0.9-servicing.26251.106 + 10.0.9-servicing.26252.101 10.0.9 10.0.9 10.0.9 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f803b88c65c..da02dbccdff 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,80 +1,80 @@ - + https://github.com/dotnet/dotnet - 5e531f538e1395bf9f93e03db04e8411a40bd9f9 + 9c33ec01179fc18803f0cf6ef1cb84b1ca6f680e https://github.com/dotnet/dotnet - 5e531f538e1395bf9f93e03db04e8411a40bd9f9 + 9c33ec01179fc18803f0cf6ef1cb84b1ca6f680e https://github.com/dotnet/dotnet - 5e531f538e1395bf9f93e03db04e8411a40bd9f9 + 9c33ec01179fc18803f0cf6ef1cb84b1ca6f680e https://github.com/dotnet/dotnet - 5e531f538e1395bf9f93e03db04e8411a40bd9f9 + 9c33ec01179fc18803f0cf6ef1cb84b1ca6f680e https://github.com/dotnet/dotnet - 5e531f538e1395bf9f93e03db04e8411a40bd9f9 + 9c33ec01179fc18803f0cf6ef1cb84b1ca6f680e https://github.com/dotnet/dotnet - 5e531f538e1395bf9f93e03db04e8411a40bd9f9 + 9c33ec01179fc18803f0cf6ef1cb84b1ca6f680e https://github.com/dotnet/dotnet - 5e531f538e1395bf9f93e03db04e8411a40bd9f9 + 9c33ec01179fc18803f0cf6ef1cb84b1ca6f680e - + https://github.com/dotnet/dotnet - 5e531f538e1395bf9f93e03db04e8411a40bd9f9 + 9c33ec01179fc18803f0cf6ef1cb84b1ca6f680e https://github.com/dotnet/dotnet - 5e531f538e1395bf9f93e03db04e8411a40bd9f9 + 9c33ec01179fc18803f0cf6ef1cb84b1ca6f680e https://github.com/dotnet/dotnet - 5e531f538e1395bf9f93e03db04e8411a40bd9f9 + 9c33ec01179fc18803f0cf6ef1cb84b1ca6f680e - + https://github.com/dotnet/dotnet - 5e531f538e1395bf9f93e03db04e8411a40bd9f9 + 9c33ec01179fc18803f0cf6ef1cb84b1ca6f680e https://github.com/dotnet/dotnet - 5e531f538e1395bf9f93e03db04e8411a40bd9f9 + 9c33ec01179fc18803f0cf6ef1cb84b1ca6f680e https://github.com/dotnet/dotnet - 5e531f538e1395bf9f93e03db04e8411a40bd9f9 + 9c33ec01179fc18803f0cf6ef1cb84b1ca6f680e https://github.com/dotnet/dotnet - 5e531f538e1395bf9f93e03db04e8411a40bd9f9 + 9c33ec01179fc18803f0cf6ef1cb84b1ca6f680e https://github.com/dotnet/dotnet - 5e531f538e1395bf9f93e03db04e8411a40bd9f9 + 9c33ec01179fc18803f0cf6ef1cb84b1ca6f680e - + https://github.com/dotnet/dotnet - 5e531f538e1395bf9f93e03db04e8411a40bd9f9 + 9c33ec01179fc18803f0cf6ef1cb84b1ca6f680e - + https://github.com/dotnet/dotnet - 5e531f538e1395bf9f93e03db04e8411a40bd9f9 + 9c33ec01179fc18803f0cf6ef1cb84b1ca6f680e - + https://github.com/dotnet/dotnet - 5e531f538e1395bf9f93e03db04e8411a40bd9f9 + 9c33ec01179fc18803f0cf6ef1cb84b1ca6f680e diff --git a/global.json b/global.json index d7a7e7130e0..2eeb1ef88ab 100644 --- a/global.json +++ b/global.json @@ -18,7 +18,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26251.106", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26251.106" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26252.101", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26252.101" } } From bd214f75aa8a88bfd9aa79cb52086a14ed69bf7d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 5 May 2026 12:45:15 +0000 Subject: [PATCH 07/14] Update dependencies from build 313015 (#38221) [release/10.0] Source code updates from dotnet/dotnet --- NuGet.config | 2 +- eng/Version.Details.props | 10 ++++---- eng/Version.Details.xml | 48 +++++++++++++++++++-------------------- global.json | 4 ++-- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/NuGet.config b/NuGet.config index 2cb62ad62b2..6f911416dbb 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index df485de330a..42c0e57975a 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,9 +6,9 @@ This file should be imported by eng/Versions.props - 10.0.0-beta.26252.101 - 10.0.0-beta.26252.101 - 10.0.0-beta.26252.101 + 10.0.0-beta.26254.110 + 10.0.0-beta.26254.110 + 10.0.0-beta.26254.110 10.0.9 10.0.9 10.0.9 @@ -16,10 +16,10 @@ This file should be imported by eng/Versions.props 10.0.9 10.0.9 10.0.9 - 10.0.9-servicing.26252.101 + 10.0.9-servicing.26254.110 10.0.9 10.0.9 - 10.0.9-servicing.26252.101 + 10.0.9-servicing.26254.110 10.0.9 10.0.9 10.0.9 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index da02dbccdff..a17ffe478eb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,80 +1,80 @@ - + https://github.com/dotnet/dotnet - 9c33ec01179fc18803f0cf6ef1cb84b1ca6f680e + 07de26790a277657c2a685124fc25601aac770e2 https://github.com/dotnet/dotnet - 9c33ec01179fc18803f0cf6ef1cb84b1ca6f680e + 07de26790a277657c2a685124fc25601aac770e2 https://github.com/dotnet/dotnet - 9c33ec01179fc18803f0cf6ef1cb84b1ca6f680e + 07de26790a277657c2a685124fc25601aac770e2 https://github.com/dotnet/dotnet - 9c33ec01179fc18803f0cf6ef1cb84b1ca6f680e + 07de26790a277657c2a685124fc25601aac770e2 https://github.com/dotnet/dotnet - 9c33ec01179fc18803f0cf6ef1cb84b1ca6f680e + 07de26790a277657c2a685124fc25601aac770e2 https://github.com/dotnet/dotnet - 9c33ec01179fc18803f0cf6ef1cb84b1ca6f680e + 07de26790a277657c2a685124fc25601aac770e2 https://github.com/dotnet/dotnet - 9c33ec01179fc18803f0cf6ef1cb84b1ca6f680e + 07de26790a277657c2a685124fc25601aac770e2 - + https://github.com/dotnet/dotnet - 9c33ec01179fc18803f0cf6ef1cb84b1ca6f680e + 07de26790a277657c2a685124fc25601aac770e2 https://github.com/dotnet/dotnet - 9c33ec01179fc18803f0cf6ef1cb84b1ca6f680e + 07de26790a277657c2a685124fc25601aac770e2 https://github.com/dotnet/dotnet - 9c33ec01179fc18803f0cf6ef1cb84b1ca6f680e + 07de26790a277657c2a685124fc25601aac770e2 - + https://github.com/dotnet/dotnet - 9c33ec01179fc18803f0cf6ef1cb84b1ca6f680e + 07de26790a277657c2a685124fc25601aac770e2 https://github.com/dotnet/dotnet - 9c33ec01179fc18803f0cf6ef1cb84b1ca6f680e + 07de26790a277657c2a685124fc25601aac770e2 https://github.com/dotnet/dotnet - 9c33ec01179fc18803f0cf6ef1cb84b1ca6f680e + 07de26790a277657c2a685124fc25601aac770e2 https://github.com/dotnet/dotnet - 9c33ec01179fc18803f0cf6ef1cb84b1ca6f680e + 07de26790a277657c2a685124fc25601aac770e2 https://github.com/dotnet/dotnet - 9c33ec01179fc18803f0cf6ef1cb84b1ca6f680e + 07de26790a277657c2a685124fc25601aac770e2 - + https://github.com/dotnet/dotnet - 9c33ec01179fc18803f0cf6ef1cb84b1ca6f680e + 07de26790a277657c2a685124fc25601aac770e2 - + https://github.com/dotnet/dotnet - 9c33ec01179fc18803f0cf6ef1cb84b1ca6f680e + 07de26790a277657c2a685124fc25601aac770e2 - + https://github.com/dotnet/dotnet - 9c33ec01179fc18803f0cf6ef1cb84b1ca6f680e + 07de26790a277657c2a685124fc25601aac770e2 diff --git a/global.json b/global.json index 2eeb1ef88ab..c1149eb35c4 100644 --- a/global.json +++ b/global.json @@ -18,7 +18,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26252.101", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26252.101" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26254.110", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26254.110" } } From 3ecb974f1cccc37b0a39a1e25aa2de8511f3cb10 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Tue, 5 May 2026 15:49:00 -0700 Subject: [PATCH 08/14] Update branding to 8.0.28 (#38227) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 3b2484ef9cd..d127da94314 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,6 +1,6 @@ - 8.0.27 + 8.0.28 servicing From c2e9e075ec5ba8ab5253d03b40b95060d31f7875 Mon Sep 17 00:00:00 2001 From: vseanreesermsft <78103370+vseanreesermsft@users.noreply.github.com> Date: Tue, 5 May 2026 15:49:00 -0700 Subject: [PATCH 09/14] Update branding to 9.0.17 (#38228) --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index abfc2c65a83..04004b153bf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -1,6 +1,6 @@ - 9.0.16 + 9.0.17 servicing From b14652369c199e9f5761223f78fd38e4d6fe94b4 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Wed, 6 May 2026 07:37:13 +0000 Subject: [PATCH 10/14] Update dependencies from build 313063 (#38224) [release/10.0] Source code updates from dotnet/dotnet --- NuGet.config | 2 +- eng/Version.Details.props | 10 ++++---- eng/Version.Details.xml | 48 +++++++++++++++++++-------------------- global.json | 4 ++-- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/NuGet.config b/NuGet.config index 6f911416dbb..565cc98f2d7 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 42c0e57975a..ba2b44993ca 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,9 +6,9 @@ This file should be imported by eng/Versions.props - 10.0.0-beta.26254.110 - 10.0.0-beta.26254.110 - 10.0.0-beta.26254.110 + 10.0.0-beta.26255.102 + 10.0.0-beta.26255.102 + 10.0.0-beta.26255.102 10.0.9 10.0.9 10.0.9 @@ -16,10 +16,10 @@ This file should be imported by eng/Versions.props 10.0.9 10.0.9 10.0.9 - 10.0.9-servicing.26254.110 + 10.0.9-servicing.26255.102 10.0.9 10.0.9 - 10.0.9-servicing.26254.110 + 10.0.9-servicing.26255.102 10.0.9 10.0.9 10.0.9 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a17ffe478eb..a9aa84144c7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,80 +1,80 @@ - + https://github.com/dotnet/dotnet - 07de26790a277657c2a685124fc25601aac770e2 + 3298b3c1d98678a61b6b57bf01d368b2a2e549d5 https://github.com/dotnet/dotnet - 07de26790a277657c2a685124fc25601aac770e2 + 3298b3c1d98678a61b6b57bf01d368b2a2e549d5 https://github.com/dotnet/dotnet - 07de26790a277657c2a685124fc25601aac770e2 + 3298b3c1d98678a61b6b57bf01d368b2a2e549d5 https://github.com/dotnet/dotnet - 07de26790a277657c2a685124fc25601aac770e2 + 3298b3c1d98678a61b6b57bf01d368b2a2e549d5 https://github.com/dotnet/dotnet - 07de26790a277657c2a685124fc25601aac770e2 + 3298b3c1d98678a61b6b57bf01d368b2a2e549d5 https://github.com/dotnet/dotnet - 07de26790a277657c2a685124fc25601aac770e2 + 3298b3c1d98678a61b6b57bf01d368b2a2e549d5 https://github.com/dotnet/dotnet - 07de26790a277657c2a685124fc25601aac770e2 + 3298b3c1d98678a61b6b57bf01d368b2a2e549d5 - + https://github.com/dotnet/dotnet - 07de26790a277657c2a685124fc25601aac770e2 + 3298b3c1d98678a61b6b57bf01d368b2a2e549d5 https://github.com/dotnet/dotnet - 07de26790a277657c2a685124fc25601aac770e2 + 3298b3c1d98678a61b6b57bf01d368b2a2e549d5 https://github.com/dotnet/dotnet - 07de26790a277657c2a685124fc25601aac770e2 + 3298b3c1d98678a61b6b57bf01d368b2a2e549d5 - + https://github.com/dotnet/dotnet - 07de26790a277657c2a685124fc25601aac770e2 + 3298b3c1d98678a61b6b57bf01d368b2a2e549d5 https://github.com/dotnet/dotnet - 07de26790a277657c2a685124fc25601aac770e2 + 3298b3c1d98678a61b6b57bf01d368b2a2e549d5 https://github.com/dotnet/dotnet - 07de26790a277657c2a685124fc25601aac770e2 + 3298b3c1d98678a61b6b57bf01d368b2a2e549d5 https://github.com/dotnet/dotnet - 07de26790a277657c2a685124fc25601aac770e2 + 3298b3c1d98678a61b6b57bf01d368b2a2e549d5 https://github.com/dotnet/dotnet - 07de26790a277657c2a685124fc25601aac770e2 + 3298b3c1d98678a61b6b57bf01d368b2a2e549d5 - + https://github.com/dotnet/dotnet - 07de26790a277657c2a685124fc25601aac770e2 + 3298b3c1d98678a61b6b57bf01d368b2a2e549d5 - + https://github.com/dotnet/dotnet - 07de26790a277657c2a685124fc25601aac770e2 + 3298b3c1d98678a61b6b57bf01d368b2a2e549d5 - + https://github.com/dotnet/dotnet - 07de26790a277657c2a685124fc25601aac770e2 + 3298b3c1d98678a61b6b57bf01d368b2a2e549d5 diff --git a/global.json b/global.json index c1149eb35c4..24fa0c69708 100644 --- a/global.json +++ b/global.json @@ -18,7 +18,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26254.110", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26254.110" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26255.102", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26255.102" } } From 1aeb8ac28efd004434b56669db3afc4b5c4a72b9 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Fri, 8 May 2026 07:36:28 +0000 Subject: [PATCH 11/14] Update dependencies from build 313473 (#38242) [release/10.0] Source code updates from dotnet/dotnet --- NuGet.config | 2 +- eng/Version.Details.props | 10 ++++---- eng/Version.Details.xml | 48 +++++++++++++++++++-------------------- global.json | 4 ++-- 4 files changed, 32 insertions(+), 32 deletions(-) diff --git a/NuGet.config b/NuGet.config index 565cc98f2d7..aff540c0d1b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index ba2b44993ca..eb1aa573d3c 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,9 +6,9 @@ This file should be imported by eng/Versions.props - 10.0.0-beta.26255.102 - 10.0.0-beta.26255.102 - 10.0.0-beta.26255.102 + 10.0.0-beta.26257.101 + 10.0.0-beta.26257.101 + 10.0.0-beta.26257.101 10.0.9 10.0.9 10.0.9 @@ -16,10 +16,10 @@ This file should be imported by eng/Versions.props 10.0.9 10.0.9 10.0.9 - 10.0.9-servicing.26255.102 + 10.0.9-servicing.26257.101 10.0.9 10.0.9 - 10.0.9-servicing.26255.102 + 10.0.9-servicing.26257.101 10.0.9 10.0.9 10.0.9 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a9aa84144c7..d2c49861a53 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,80 +1,80 @@ - + https://github.com/dotnet/dotnet - 3298b3c1d98678a61b6b57bf01d368b2a2e549d5 + dc6e7082d768b79e69b16e8fd146a509dfa6130d https://github.com/dotnet/dotnet - 3298b3c1d98678a61b6b57bf01d368b2a2e549d5 + dc6e7082d768b79e69b16e8fd146a509dfa6130d https://github.com/dotnet/dotnet - 3298b3c1d98678a61b6b57bf01d368b2a2e549d5 + dc6e7082d768b79e69b16e8fd146a509dfa6130d https://github.com/dotnet/dotnet - 3298b3c1d98678a61b6b57bf01d368b2a2e549d5 + dc6e7082d768b79e69b16e8fd146a509dfa6130d https://github.com/dotnet/dotnet - 3298b3c1d98678a61b6b57bf01d368b2a2e549d5 + dc6e7082d768b79e69b16e8fd146a509dfa6130d https://github.com/dotnet/dotnet - 3298b3c1d98678a61b6b57bf01d368b2a2e549d5 + dc6e7082d768b79e69b16e8fd146a509dfa6130d https://github.com/dotnet/dotnet - 3298b3c1d98678a61b6b57bf01d368b2a2e549d5 + dc6e7082d768b79e69b16e8fd146a509dfa6130d - + https://github.com/dotnet/dotnet - 3298b3c1d98678a61b6b57bf01d368b2a2e549d5 + dc6e7082d768b79e69b16e8fd146a509dfa6130d https://github.com/dotnet/dotnet - 3298b3c1d98678a61b6b57bf01d368b2a2e549d5 + dc6e7082d768b79e69b16e8fd146a509dfa6130d https://github.com/dotnet/dotnet - 3298b3c1d98678a61b6b57bf01d368b2a2e549d5 + dc6e7082d768b79e69b16e8fd146a509dfa6130d - + https://github.com/dotnet/dotnet - 3298b3c1d98678a61b6b57bf01d368b2a2e549d5 + dc6e7082d768b79e69b16e8fd146a509dfa6130d https://github.com/dotnet/dotnet - 3298b3c1d98678a61b6b57bf01d368b2a2e549d5 + dc6e7082d768b79e69b16e8fd146a509dfa6130d https://github.com/dotnet/dotnet - 3298b3c1d98678a61b6b57bf01d368b2a2e549d5 + dc6e7082d768b79e69b16e8fd146a509dfa6130d https://github.com/dotnet/dotnet - 3298b3c1d98678a61b6b57bf01d368b2a2e549d5 + dc6e7082d768b79e69b16e8fd146a509dfa6130d https://github.com/dotnet/dotnet - 3298b3c1d98678a61b6b57bf01d368b2a2e549d5 + dc6e7082d768b79e69b16e8fd146a509dfa6130d - + https://github.com/dotnet/dotnet - 3298b3c1d98678a61b6b57bf01d368b2a2e549d5 + dc6e7082d768b79e69b16e8fd146a509dfa6130d - + https://github.com/dotnet/dotnet - 3298b3c1d98678a61b6b57bf01d368b2a2e549d5 + dc6e7082d768b79e69b16e8fd146a509dfa6130d - + https://github.com/dotnet/dotnet - 3298b3c1d98678a61b6b57bf01d368b2a2e549d5 + dc6e7082d768b79e69b16e8fd146a509dfa6130d diff --git a/global.json b/global.json index 24fa0c69708..27c38834202 100644 --- a/global.json +++ b/global.json @@ -18,7 +18,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26255.102", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26255.102" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26257.101", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26257.101" } } From 6fecf7f6e78403c04ce8e127a0606336109d690c Mon Sep 17 00:00:00 2001 From: Andriy Svyryd Date: Fri, 8 May 2026 11:03:10 -0700 Subject: [PATCH 12/14] [release/10.0] Multi-target Microsoft.EntityFrameworkCore.Tools for net8.0, net9.0, net10.0 (#38210) Fixes #38107 --- src/EFCore.Tools/EFCore.Tools.nuspec | 10 ++++++++-- src/EFCore.Tools/lib/net10.0/_._ | 0 src/EFCore.Tools/lib/net9.0/_._ | 0 3 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 src/EFCore.Tools/lib/net10.0/_._ create mode 100644 src/EFCore.Tools/lib/net9.0/_._ diff --git a/src/EFCore.Tools/EFCore.Tools.nuspec b/src/EFCore.Tools/EFCore.Tools.nuspec index 7201a3eff73..a97e90ef228 100644 --- a/src/EFCore.Tools/EFCore.Tools.nuspec +++ b/src/EFCore.Tools/EFCore.Tools.nuspec @@ -4,8 +4,14 @@ $CommonMetadataElements$ - - + + + + + + + + docs\PACKAGE.md diff --git a/src/EFCore.Tools/lib/net10.0/_._ b/src/EFCore.Tools/lib/net10.0/_._ new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/EFCore.Tools/lib/net9.0/_._ b/src/EFCore.Tools/lib/net9.0/_._ new file mode 100644 index 00000000000..e69de29bb2d From 8429e31e7a72e7de577e4dba3bae8652eade271a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 8 May 2026 11:07:42 -0700 Subject: [PATCH 13/14] Bump SQLitePCLRaw.bundle_e_sqlite3 from 3.0.2 to 3.0.3 (#38247) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- eng/Versions.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/Versions.props b/eng/Versions.props index 253fefa1435..914fd31db50 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -49,7 +49,7 @@ 1.20.0 1.4.0 1.15.1 - 3.0.2 + 3.0.3 2.3.2 From 62700ec6c4ec205aaa4fb34c9754e0d41781f345 Mon Sep 17 00:00:00 2001 From: Maxwell <61754723+m-x-shokhzod@users.noreply.github.com> Date: Fri, 8 May 2026 23:17:05 +0500 Subject: [PATCH 14/14] Improve conflicting member exception message (#38222) Fixes #36487 --- src/EFCore/EFCore.baseline.json | 5 +- .../Builders/ReferenceNavigationBuilder.cs | 4 +- src/EFCore/Metadata/Internal/EntityType.cs | 13 ++--- .../Internal/InternalEntityTypeBuilder.cs | 3 +- .../Internal/PropertyBaseExtensions.cs | 50 +++++++++++++++++++ src/EFCore/Metadata/Internal/TypeBase.cs | 8 +-- src/EFCore/Properties/CoreStrings.Designer.cs | 16 ++++-- src/EFCore/Properties/CoreStrings.resx | 7 ++- .../ModelBuilderTest.OneToOne.cs | 2 +- .../Internal/EntityTypeTest.BaseType.cs | 8 +-- .../Metadata/Internal/EntityTypeTest.cs | 28 +++++------ .../Internal/InternalEntityTypeBuilderTest.cs | 22 ++++++-- 12 files changed, 117 insertions(+), 49 deletions(-) diff --git a/src/EFCore/EFCore.baseline.json b/src/EFCore/EFCore.baseline.json index b52c3b307fa..bffa286d455 100644 --- a/src/EFCore/EFCore.baseline.json +++ b/src/EFCore/EFCore.baseline.json @@ -3851,7 +3851,10 @@ "Member": "static string ConflictingKeylessAndPrimaryKeyAttributes(object? entity);" }, { - "Member": "static string ConflictingPropertyOrNavigation(object? member, object? type, object? conflictingType);" + "Member": "static string ConflictingPropertyOrNavigationOnBaseType(object? member, object? type, object? conflictingMemberKind, object? conflictingType);" + }, + { + "Member": "static string ConflictingPropertyOrNavigationWithKind(object? member, object? type, object? conflictingMemberKind);" }, { "Member": "static string ConflictingRelationshipConversions(object? entityType, object? property, object? valueConversion, object? conflictingValueConversion);" diff --git a/src/EFCore/Metadata/Builders/ReferenceNavigationBuilder.cs b/src/EFCore/Metadata/Builders/ReferenceNavigationBuilder.cs index dcb060b5d62..f9d66346752 100644 --- a/src/EFCore/Metadata/Builders/ReferenceNavigationBuilder.cs +++ b/src/EFCore/Metadata/Builders/ReferenceNavigationBuilder.cs @@ -238,8 +238,8 @@ private InternalForeignKeyBuilder WithOneBuilder(MemberIdentity reference) && ReferenceName == referenceName) { throw new InvalidOperationException( - CoreStrings.ConflictingPropertyOrNavigation( - referenceName, RelatedEntityType.DisplayName(), RelatedEntityType.DisplayName())); + CoreStrings.ConflictingPropertyOrNavigationWithKind( + referenceName, RelatedEntityType.DisplayName(), "navigation")); } var pointsToPrincipal = !foreignKey.IsSelfReferencing() diff --git a/src/EFCore/Metadata/Internal/EntityType.cs b/src/EFCore/Metadata/Internal/EntityType.cs index 6cc6fcf2bef..a5b15b86883 100644 --- a/src/EFCore/Metadata/Internal/EntityType.cs +++ b/src/EFCore/Metadata/Internal/EntityType.cs @@ -1451,16 +1451,14 @@ public virtual Navigation AddNavigation(MemberIdentity navigationMember, Foreign } throw new InvalidOperationException( - CoreStrings.ConflictingPropertyOrNavigation( - name, DisplayName(), duplicateNavigation.DeclaringEntityType.DisplayName())); + duplicateNavigation.FormatConflictingMemberMessage(name, this)); } var duplicateProperty = FindMembersInHierarchy(name).FirstOrDefault(); if (duplicateProperty != null) { throw new InvalidOperationException( - CoreStrings.ConflictingPropertyOrNavigation( - name, DisplayName(), ((IReadOnlyTypeBase)duplicateProperty.DeclaringType).DisplayName())); + duplicateProperty.FormatConflictingMemberMessage(name, this)); } Check.DebugAssert( @@ -1633,8 +1631,7 @@ public virtual IEnumerable GetNavigations() if (duplicateProperty != null) { throw new InvalidOperationException( - CoreStrings.ConflictingPropertyOrNavigation( - name, DisplayName(), duplicateProperty.DeclaringType.DisplayName())); + duplicateProperty.FormatConflictingMemberMessage(name, this)); } if (memberInfo != null) @@ -2286,9 +2283,7 @@ public virtual ServiceProperty AddServiceProperty( if (duplicateMember != null) { throw new InvalidOperationException( - CoreStrings.ConflictingPropertyOrNavigation( - name, DisplayName(), - ((IReadOnlyTypeBase)duplicateMember.DeclaringType).DisplayName())); + duplicateMember.FormatConflictingMemberMessage(name, this)); } ValidateClrMember(name, memberInfo, false); diff --git a/src/EFCore/Metadata/Internal/InternalEntityTypeBuilder.cs b/src/EFCore/Metadata/Internal/InternalEntityTypeBuilder.cs index 72f06816d57..b7f507e130d 100644 --- a/src/EFCore/Metadata/Internal/InternalEntityTypeBuilder.cs +++ b/src/EFCore/Metadata/Internal/InternalEntityTypeBuilder.cs @@ -541,8 +541,7 @@ public override void RemoveMembersInHierarchy(string propertyName, Configuration if (conflictingNavigation.GetConfigurationSource() == ConfigurationSource.Explicit) { throw new InvalidOperationException( - CoreStrings.ConflictingPropertyOrNavigation( - propertyName, Metadata.DisplayName(), conflictingNavigation.DeclaringEntityType.DisplayName())); + conflictingNavigation.FormatConflictingMemberMessage(propertyName, Metadata)); } var foreignKey = conflictingNavigation.ForeignKey; diff --git a/src/EFCore/Metadata/Internal/PropertyBaseExtensions.cs b/src/EFCore/Metadata/Internal/PropertyBaseExtensions.cs index 19b27dace99..0588611cc57 100644 --- a/src/EFCore/Metadata/Internal/PropertyBaseExtensions.cs +++ b/src/EFCore/Metadata/Internal/PropertyBaseExtensions.cs @@ -338,6 +338,56 @@ or PropertyAccessMode.FieldDuringConstruction return false; } + /// + /// Builds the message for the diagnostic that fires when a member conflicts with an existing + /// member on the structural type or one of its base types. The kind of the conflicting member + /// is humanized via so the user-facing message uses stable + /// labels like "property", "complex property", "navigation", "skip navigation", or + /// "service property" regardless of whether the conflicting member came from a model or a + /// runtime model. + /// + /// + /// This is an internal API that supports the Entity Framework Core infrastructure and not subject to + /// the same compatibility standards as public APIs. It may be changed or removed without notice in + /// any release. You should only use it directly in your code with extreme caution and knowing that + /// doing so can result in application failures when updating to a new Entity Framework Core release. + /// + public static string FormatConflictingMemberMessage( + this IReadOnlyPropertyBase conflictingMember, + string newMemberName, + IReadOnlyTypeBase owningType) + { + var conflictingMemberKind = GetMemberKindString(conflictingMember); + var owningTypeDisplayName = owningType.DisplayName(); + + // Compare the actual metadata instances rather than display names to avoid false positives when + // two distinct types share a simple name (e.g. same name in different namespaces or hierarchies). + return conflictingMember.DeclaringType == owningType + ? CoreStrings.ConflictingPropertyOrNavigationWithKind(newMemberName, owningTypeDisplayName, conflictingMemberKind) + : CoreStrings.ConflictingPropertyOrNavigationOnBaseType( + newMemberName, + owningTypeDisplayName, + conflictingMemberKind, + ((IReadOnlyTypeBase)conflictingMember.DeclaringType).DisplayName()); + } + + /// + /// Returns a human-readable label for the kind of the given member (e.g. "property", + /// "complex property", "navigation", "skip navigation", "service property"). Used to build + /// user-facing diagnostic messages without coupling the message text to internal CLR class + /// names (such as RuntimeProperty or SkipNavigation). + /// + private static string GetMemberKindString(IReadOnlyPropertyBase member) + => member switch + { + IReadOnlyComplexProperty => "complex property", + IReadOnlySkipNavigation => "skip navigation", + IReadOnlyNavigation => "navigation", + IReadOnlyServiceProperty => "service property", + IReadOnlyProperty => "property", + _ => member.GetType().Name + }; + private static string GetNoFieldErrorMessage(IPropertyBase propertyBase) => propertyBase.DeclaringType switch { diff --git a/src/EFCore/Metadata/Internal/TypeBase.cs b/src/EFCore/Metadata/Internal/TypeBase.cs index 0cfe3f25afc..3b3fe513e32 100644 --- a/src/EFCore/Metadata/Internal/TypeBase.cs +++ b/src/EFCore/Metadata/Internal/TypeBase.cs @@ -634,9 +634,7 @@ private void CheckDiscriminatorProperty(Property? property) if (conflictingMember != null) { throw new InvalidOperationException( - CoreStrings.ConflictingPropertyOrNavigation( - name, DisplayName(), - ((IReadOnlyTypeBase)conflictingMember.DeclaringType).DisplayName())); + conflictingMember.FormatConflictingMemberMessage(name, this)); } if (memberInfo != null) @@ -1082,9 +1080,7 @@ public virtual IReadOnlyDictionary GetRuntimeFields() if (conflictingMember != null) { throw new InvalidOperationException( - CoreStrings.ConflictingPropertyOrNavigation( - name, DisplayName(), - conflictingMember.DeclaringType.DisplayName())); + conflictingMember.FormatConflictingMemberMessage(name, this)); } if (memberInfo != null) diff --git a/src/EFCore/Properties/CoreStrings.Designer.cs b/src/EFCore/Properties/CoreStrings.Designer.cs index bf9d212a078..7f65927b402 100644 --- a/src/EFCore/Properties/CoreStrings.Designer.cs +++ b/src/EFCore/Properties/CoreStrings.Designer.cs @@ -877,12 +877,20 @@ public static string ConflictingKeylessAndPrimaryKeyAttributes(object? entity) entity); /// - /// The property or navigation '{member}' cannot be added to the '{type}' type because a property or navigation with the same name already exists on the '{conflictingType}' type. + /// The member '{member}' cannot be added to the '{type}' type because a {conflictingMemberKind} with the same name already exists on the '{conflictingType}' type. Remove the existing {conflictingMemberKind} first. /// - public static string ConflictingPropertyOrNavigation(object? member, object? type, object? conflictingType) + public static string ConflictingPropertyOrNavigationOnBaseType(object? member, object? type, object? conflictingMemberKind, object? conflictingType) => string.Format( - GetString("ConflictingPropertyOrNavigation", nameof(member), nameof(type), nameof(conflictingType)), - member, type, conflictingType); + GetString("ConflictingPropertyOrNavigationOnBaseType", nameof(member), nameof(type), nameof(conflictingMemberKind), nameof(conflictingType)), + member, type, conflictingMemberKind, conflictingType); + + /// + /// The member '{member}' cannot be added to the '{type}' type because a {conflictingMemberKind} with the same name already exists. Remove the existing {conflictingMemberKind} first. + /// + public static string ConflictingPropertyOrNavigationWithKind(object? member, object? type, object? conflictingMemberKind) + => string.Format( + GetString("ConflictingPropertyOrNavigationWithKind", nameof(member), nameof(type), nameof(conflictingMemberKind)), + member, type, conflictingMemberKind); /// /// The property '{entityType}.{property}' participates in several relationship chains that have conflicting conversions: '{valueConversion}' and '{conflictingValueConversion}'. diff --git a/src/EFCore/Properties/CoreStrings.resx b/src/EFCore/Properties/CoreStrings.resx index 673e2719b39..ba84a1aebd1 100644 --- a/src/EFCore/Properties/CoreStrings.resx +++ b/src/EFCore/Properties/CoreStrings.resx @@ -438,8 +438,11 @@ The entity type '{entity}' has both [Keyless] and [PrimaryKey] attributes; one must be removed. - - The property or navigation '{member}' cannot be added to the '{type}' type because a property or navigation with the same name already exists on the '{conflictingType}' type. + + The member '{member}' cannot be added to the '{type}' type because a {conflictingMemberKind} with the same name already exists on the '{conflictingType}' type. Remove the existing {conflictingMemberKind} first. + + + The member '{member}' cannot be added to the '{type}' type because a {conflictingMemberKind} with the same name already exists. Remove the existing {conflictingMemberKind} first. The property '{entityType}.{property}' participates in several relationship chains that have conflicting conversions: '{valueConversion}' and '{conflictingValueConversion}'. diff --git a/test/EFCore.Specification.Tests/ModelBuilding/ModelBuilderTest.OneToOne.cs b/test/EFCore.Specification.Tests/ModelBuilding/ModelBuilderTest.OneToOne.cs index 5c446e28541..9cedb5df661 100644 --- a/test/EFCore.Specification.Tests/ModelBuilding/ModelBuilderTest.OneToOne.cs +++ b/test/EFCore.Specification.Tests/ModelBuilding/ModelBuilderTest.OneToOne.cs @@ -3050,7 +3050,7 @@ public virtual void Throws_on_duplicate_navigation_when_self_referencing() var modelBuilder = CreateModelBuilder(); Assert.Equal( - CoreStrings.ConflictingPropertyOrNavigation("SelfRef1", nameof(SelfRef), nameof(SelfRef)), + CoreStrings.ConflictingPropertyOrNavigationWithKind("SelfRef1", nameof(SelfRef), "navigation"), Assert.Throws(() => modelBuilder.Entity().HasOne(e => e.SelfRef1).WithOne(e => e.SelfRef1)).Message); } diff --git a/test/EFCore.Tests/Metadata/Internal/EntityTypeTest.BaseType.cs b/test/EFCore.Tests/Metadata/Internal/EntityTypeTest.BaseType.cs index 55a33981625..13d94f1e9ab 100644 --- a/test/EFCore.Tests/Metadata/Internal/EntityTypeTest.BaseType.cs +++ b/test/EFCore.Tests/Metadata/Internal/EntityTypeTest.BaseType.cs @@ -370,7 +370,7 @@ public void Adding_property_throws_when_parent_type_has_property_with_same_name( b.BaseType = a; Assert.Equal( - CoreStrings.ConflictingPropertyOrNavigation("G", typeof(B).Name, typeof(A).Name), + CoreStrings.ConflictingPropertyOrNavigationOnBaseType("G", typeof(B).Name, "property", typeof(A).Name), Assert.Throws(() => b.AddProperty("G")).Message); } @@ -389,7 +389,7 @@ public void Adding_property_throws_when_grandparent_type_has_property_with_same_ d.BaseType = c; Assert.Equal( - CoreStrings.ConflictingPropertyOrNavigation("G", typeof(D).Name, typeof(A).Name), + CoreStrings.ConflictingPropertyOrNavigationOnBaseType("G", typeof(D).Name, "property", typeof(A).Name), Assert.Throws(() => d.AddProperty("G")).Message); } @@ -406,7 +406,7 @@ public void Adding_property_throws_when_child_type_has_property_with_same_name() b.AddProperty(A.GProperty); Assert.Equal( - CoreStrings.ConflictingPropertyOrNavigation("G", typeof(A).Name, typeof(B).Name), + CoreStrings.ConflictingPropertyOrNavigationOnBaseType("G", typeof(A).Name, "property", typeof(B).Name), Assert.Throws(() => a.AddProperty(A.GProperty)).Message); } @@ -426,7 +426,7 @@ public void Adding_property_throws_when_grandchild_type_has_property_with_same_n d.AddProperty(A.GProperty); Assert.Equal( - CoreStrings.ConflictingPropertyOrNavigation("G", typeof(A).Name, typeof(D).Name), + CoreStrings.ConflictingPropertyOrNavigationOnBaseType("G", typeof(A).Name, "property", typeof(D).Name), Assert.Throws(() => a.AddProperty(A.GProperty)).Message); } diff --git a/test/EFCore.Tests/Metadata/Internal/EntityTypeTest.cs b/test/EFCore.Tests/Metadata/Internal/EntityTypeTest.cs index baa296d820e..7180c5b7039 100644 --- a/test/EFCore.Tests/Metadata/Internal/EntityTypeTest.cs +++ b/test/EFCore.Tests/Metadata/Internal/EntityTypeTest.cs @@ -952,7 +952,7 @@ public void Adding_a_new_navigation_with_a_name_that_conflicts_with_a_property_t orderType.AddProperty("Customer"); Assert.Equal( - CoreStrings.ConflictingPropertyOrNavigation("Customer", typeof(Order).Name, typeof(Order).Name), + CoreStrings.ConflictingPropertyOrNavigationWithKind("Customer", typeof(Order).Name, "property"), Assert.Throws(() => customerForeignKey.SetDependentToPrincipal("Customer")).Message); } @@ -970,7 +970,7 @@ public void Adding_a_new_navigation_with_a_name_that_conflicts_with_a_service_pr orderType.AddServiceProperty(Order.CustomerProperty); Assert.Equal( - CoreStrings.ConflictingPropertyOrNavigation(nameof(Order.Customer), nameof(Order), nameof(Order)), + CoreStrings.ConflictingPropertyOrNavigationWithKind(nameof(Order.Customer), nameof(Order), "service property"), Assert.Throws(() => customerForeignKey.SetDependentToPrincipal(nameof(Order.Customer))).Message); } @@ -1154,7 +1154,7 @@ public void Throws_when_adding_same_self_referencing_navigation_twice() fk.SetPrincipalToDependent(SelfRef.SelfRef1Property); Assert.Equal( - CoreStrings.ConflictingPropertyOrNavigation(nameof(SelfRef.SelfRef1), typeof(SelfRef).Name, typeof(SelfRef).Name), + CoreStrings.ConflictingPropertyOrNavigationWithKind(nameof(SelfRef.SelfRef1), typeof(SelfRef).Name, "navigation"), Assert.Throws(() => fk.SetDependentToPrincipal(SelfRef.SelfRef1Property)).Message); } @@ -1363,7 +1363,7 @@ public void Adding_skip_navigation_with_a_name_that_conflicts_with_another_skip_ navigation.SetForeignKey(orderProductForeignKey); Assert.Equal( - CoreStrings.ConflictingPropertyOrNavigation(nameof(Order.Products), typeof(Order).Name, typeof(Order).Name), + CoreStrings.ConflictingPropertyOrNavigationWithKind(nameof(Order.Products), typeof(Order).Name, "skip navigation"), Assert.Throws(() => orderEntity.AddSkipNavigation( nameof(Order.Products), null, null, productEntity, true, false)).Message); @@ -1388,7 +1388,7 @@ public void Adding_skip_navigation_with_a_name_that_conflicts_with_a_navigation_ customerForeignKey.SetPrincipalToDependent(nameof(Order.Products)); Assert.Equal( - CoreStrings.ConflictingPropertyOrNavigation(nameof(Order.Products), typeof(Order).Name, typeof(Order).Name), + CoreStrings.ConflictingPropertyOrNavigationWithKind(nameof(Order.Products), typeof(Order).Name, "navigation"), Assert.Throws(() => orderEntity.AddSkipNavigation( nameof(Order.Products), null, null, productEntity, true, false)).Message); @@ -1410,7 +1410,7 @@ public void Adding_skip_navigation_with_a_name_that_conflicts_with_a_property_th orderEntity.AddProperty(nameof(Order.Products)); Assert.Equal( - CoreStrings.ConflictingPropertyOrNavigation(nameof(Order.Products), typeof(Order).Name, typeof(Order).Name), + CoreStrings.ConflictingPropertyOrNavigationWithKind(nameof(Order.Products), typeof(Order).Name, "property"), Assert.Throws(() => orderEntity.AddSkipNavigation( nameof(Order.Products), null, null, productEntity, true, false)).Message); @@ -1432,7 +1432,7 @@ public void Adding_skip_navigation_with_a_name_that_conflicts_with_a_service_pro orderEntity.AddServiceProperty(Order.ProductsProperty); Assert.Equal( - CoreStrings.ConflictingPropertyOrNavigation(nameof(Order.Products), typeof(Order).Name, typeof(Order).Name), + CoreStrings.ConflictingPropertyOrNavigationWithKind(nameof(Order.Products), typeof(Order).Name, "service property"), Assert.Throws(() => orderEntity.AddSkipNavigation( nameof(Order.Products), null, null, productEntity, true, false)).Message); @@ -2046,7 +2046,7 @@ public void Adding_a_new_property_with_a_name_that_already_exists_throws() entityType.AddProperty(Customer.IdProperty); Assert.Equal( - CoreStrings.ConflictingPropertyOrNavigation("Id", typeof(Customer).Name, typeof(Customer).Name), + CoreStrings.ConflictingPropertyOrNavigationWithKind("Id", typeof(Customer).Name, "property"), Assert.Throws(() => entityType.AddProperty("Id")).Message); } @@ -2064,7 +2064,7 @@ public void Adding_a_new_property_with_a_name_that_conflicts_with_a_navigation_t customerForeignKey.SetDependentToPrincipal(Order.CustomerProperty); Assert.Equal( - CoreStrings.ConflictingPropertyOrNavigation("Customer", typeof(Order).Name, typeof(Order).Name), + CoreStrings.ConflictingPropertyOrNavigationWithKind("Customer", typeof(Order).Name, "navigation"), Assert.Throws(() => orderType.AddProperty("Customer")).Message); } @@ -2082,7 +2082,7 @@ public void Adding_a_new_property_with_a_name_that_conflicts_with_a_service_prop customerForeignKey.SetDependentToPrincipal(Order.CustomerProperty); Assert.Equal( - CoreStrings.ConflictingPropertyOrNavigation(nameof(Order.Customer), nameof(Order), nameof(Order)), + CoreStrings.ConflictingPropertyOrNavigationWithKind(nameof(Order.Customer), nameof(Order), "navigation"), Assert.Throws(() => orderType.AddServiceProperty(Order.CustomerProperty)).Message); } @@ -2094,7 +2094,7 @@ public void Adding_a_new_service_property_with_a_name_that_conflicts_with_a_prop entityType.AddProperty(Customer.OrdersProperty); Assert.Equal( - CoreStrings.ConflictingPropertyOrNavigation(nameof(Customer.Orders), nameof(Customer), nameof(Customer)), + CoreStrings.ConflictingPropertyOrNavigationWithKind(nameof(Customer.Orders), nameof(Customer), "property"), Assert.Throws(() => entityType.AddServiceProperty(Customer.OrdersProperty)).Message); } @@ -2112,7 +2112,7 @@ public void Adding_a_new_service_property_with_a_name_that_conflicts_with_a_navi customerForeignKey.SetDependentToPrincipal(Order.CustomerProperty); Assert.Equal( - CoreStrings.ConflictingPropertyOrNavigation(nameof(Order.Customer), nameof(Order), nameof(Order)), + CoreStrings.ConflictingPropertyOrNavigationWithKind(nameof(Order.Customer), nameof(Order), "navigation"), Assert.Throws(() => orderType.AddServiceProperty(Order.CustomerProperty)).Message); } @@ -2124,7 +2124,7 @@ public void Adding_a_new_service_property_with_a_name_that_already_exists_throws entityType.AddServiceProperty(Customer.OrdersProperty); Assert.Equal( - CoreStrings.ConflictingPropertyOrNavigation(nameof(Customer.Orders), nameof(Customer), nameof(Customer)), + CoreStrings.ConflictingPropertyOrNavigationWithKind(nameof(Customer.Orders), nameof(Customer), "service property"), Assert.Throws(() => entityType.AddServiceProperty(Customer.OrdersProperty)).Message); } @@ -2202,7 +2202,7 @@ public void AddIndexerProperty_throws_when_entitytype_have_property_with_same_na entityType.AddProperty("Nation", typeof(string)); Assert.Equal( - CoreStrings.ConflictingPropertyOrNavigation("Nation", entityType.DisplayName(), entityType.DisplayName()), + CoreStrings.ConflictingPropertyOrNavigationWithKind("Nation", entityType.DisplayName(), "property"), Assert.Throws(() => entityType.AddIndexerProperty("Nation", typeof(string))).Message); Assert.Equal( diff --git a/test/EFCore.Tests/Metadata/Internal/InternalEntityTypeBuilderTest.cs b/test/EFCore.Tests/Metadata/Internal/InternalEntityTypeBuilderTest.cs index e96a0e82c7f..7b56e19f017 100644 --- a/test/EFCore.Tests/Metadata/Internal/InternalEntityTypeBuilderTest.cs +++ b/test/EFCore.Tests/Metadata/Internal/InternalEntityTypeBuilderTest.cs @@ -1667,8 +1667,8 @@ public void Property_throws_for_navigation() ConfigurationSource.Explicit); Assert.Equal( - CoreStrings.ConflictingPropertyOrNavigation( - nameof(Order.Customer), nameof(Order), nameof(Order)), + CoreStrings.ConflictingPropertyOrNavigationWithKind( + nameof(Order.Customer), nameof(Order), "navigation"), Assert.Throws(() => dependentEntityBuilder .Property(Order.CustomerProperty, ConfigurationSource.Explicit)).Message); } @@ -2487,9 +2487,23 @@ private void VerifyOverrideMembers( } else { + var conflictingKind = firstMemberType switch + { + MemberType.Property => "property", + MemberType.ComplexProperty => "complex property", + MemberType.ServiceProperty => "service property", + MemberType.Navigation => "navigation", + MemberType.SkipNavigation => "skip navigation", + _ => throw new InvalidOperationException() + }; + var declaringTypeName = firstEntityTypeBuilder.Metadata.DisplayName(); + Assert.Equal( - CoreStrings.ConflictingPropertyOrNavigation( - nameof(Order.Products), nameof(SpecialOrder), firstEntityTypeBuilder.Metadata.DisplayName()), + declaringTypeName == nameof(SpecialOrder) + ? CoreStrings.ConflictingPropertyOrNavigationWithKind( + nameof(Order.Products), nameof(SpecialOrder), conflictingKind) + : CoreStrings.ConflictingPropertyOrNavigationOnBaseType( + nameof(Order.Products), nameof(SpecialOrder), conflictingKind, declaringTypeName), Assert.Throws(() => ConfigureMember(secondEntityTypeBuilder, secondMemberType, secondSource)) .Message);