Merge in 'release/7.0' changes

dotnet-bot · dotnet-bot · commit 1123a9a676af · 2023-05-03T18:55:17.000Z
diff --git a/src/EFCore.SqlServer/Update/Internal/SqlServerUpdateSqlGenerator.cs b/src/EFCore.SqlServer/Update/Internal/SqlServerUpdateSqlGenerator.cs
@@ -16,7 +16,7 @@ namespace Microsoft.EntityFrameworkCore.SqlServer.Update.Internal;
 public class SqlServerUpdateSqlGenerator : UpdateAndSelectSqlGenerator, ISqlServerUpdateSqlGenerator
 {
     private static readonly bool UseOldBehavior30330
-        = AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue30330 ", out var enabled30330) && enabled30330;
+        = AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue30330", out var enabled30330) && enabled30330;
 
     /// <summary>
     ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ namespace Microsoft.EntityFrameworkCore.SqlServer.Update.Internal;`
`16`	`16`	`public class SqlServerUpdateSqlGenerator : UpdateAndSelectSqlGenerator, ISqlServerUpdateSqlGenerator`
`17`	`17`	`{`
`18`	`18`	`private static readonly bool UseOldBehavior30330`
`19`		`- = AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue30330 ", out var enabled30330) && enabled30330;`
	`19`	`+ = AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue30330", out var enabled30330) && enabled30330;`
`20`	`20`
`21`	`21`	`/// <summary>`
`22`	`22`	`/// This is an internal API that supports the Entity Framework Core infrastructure and not subject to`