[automated] Merge branch 'release/10.0' => 'main'

src/EFCore.Relational/Query/Internal/RelationalParameterProcessor.cs

@@ -40,9 +40,6 @@ private readonly IDictionary<FromSqlExpression, Expression> _visitedFromSqlExpre
     private ParametersCacheDecorator _parametersDecorator;
     private ParameterNameGenerator _parameterNameGenerator;
 
-    private static readonly bool UseOldBehavior37189 =
-        AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue37189", out var enabled37189) && enabled37189;
-
     /// <summary>
     ///     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
@@ -123,7 +120,7 @@ private SqlParameterExpression VisitSqlParameter(SqlParameterExpression paramete
             && (existingTypeMapping.Converter is null && typeMapping.Converter is null
                 || existingTypeMapping.Converter is not null && existingTypeMapping.Converter.Equals(typeMapping.Converter)))
         {
-            return UseOldBehavior37189 ? parameter : existingParameter;
+            return existingParameter;
         }
 
         var uniquifiedName = UniquifyParameterName(parameter.Name);

src/EFCore.SqlServer/Migrations/SqlServerMigrationsSqlGenerator.cs

@@ -1388,6 +1388,15 @@ protected override void Generate(
         builder.EndCommand();
     }
 
+    private enum ParsingState
+    {
+        Normal,
+        InBlockComment,
+        InSquareBrackets,
+        InDoubleQuotes,
+        InQuotes
+    }
+
     /// <summary>
     ///     Builds commands for the given <see cref="SqlOperation" /> by making calls on the given
     ///     <see cref="MigrationCommandListBuilder" />, and then terminates the final command.
@@ -1402,12 +1411,13 @@ protected override void Generate(SqlOperation operation, IModel? model, Migratio
             .Replace("\\\r\n", "")
             .Split(["\r\n", "\n"], StringSplitOptions.None);
 
-        var quoted = false;
+        var state = ParsingState.Normal;
         var batchBuilder = new StringBuilder();
         foreach (var line in preBatched)
         {
             var trimmed = line.TrimStart();
-            if (!quoted
+
+            if (state == ParsingState.Normal
                 && trimmed.StartsWith("GO", StringComparison.OrdinalIgnoreCase)
                 && (trimmed.Length == 2
                     || char.IsWhiteSpace(trimmed[2])))
@@ -1427,31 +1437,34 @@ protected override void Generate(SqlOperation operation, IModel? model, Migratio
             }
             else
             {
-                var commentStart = false;
-                foreach (var c in trimmed)
+                for (var i = 0; i < trimmed.Length; i++)
                 {
-                    switch (c)
+                    var c = trimmed[i];
+                    var next = i + 1 < trimmed.Length ? trimmed[i + 1] : '\0';
+
+                    if (state == ParsingState.Normal && c == '-' && next == '-')
                     {
-                        case '\'':
-                            quoted = !quoted;
-                            commentStart = false;
-                            break;
-                        case '-':
-                            if (!quoted)
-                            {
-                                if (commentStart)
-                                {
-                                    goto LineEnd;
-                                }
+                        goto LineEnd;
+                    }
 
-                                commentStart = true;
-                            }
+                    state = state switch
+                    {
+                        ParsingState.Normal when c == '\'' => ParsingState.InQuotes,
+                        ParsingState.Normal when c == '[' => ParsingState.InSquareBrackets,
+                        ParsingState.Normal when c == '"' => ParsingState.InDoubleQuotes,
+                        ParsingState.Normal when c == '/' && next == '*' => ConsumeAndReturn(ref i, ParsingState.InBlockComment),
 
-                            break;
-                        default:
-                            commentStart = false;
-                            break;
-                    }
+                        ParsingState.InQuotes when c == '\'' => ParsingState.Normal,
+
+                        ParsingState.InSquareBrackets when c == ']' && next == ']' => ConsumeAndReturn(ref i, ParsingState.InSquareBrackets),
+                        ParsingState.InSquareBrackets when c == ']' => ParsingState.Normal,
+
+                        ParsingState.InDoubleQuotes when c == '"' => ParsingState.Normal,
+
+                        ParsingState.InBlockComment when c == '*' && next == '/' => ConsumeAndReturn(ref i, ParsingState.Normal),
+
+                        _ => state
+                    };
                 }
 
                 LineEnd:
@@ -1461,6 +1474,12 @@ protected override void Generate(SqlOperation operation, IModel? model, Migratio
 
         AppendBatch(batchBuilder.ToString());
 
+        ParsingState ConsumeAndReturn(ref int index, ParsingState newState)
+        {
+            index++;
+            return newState;
+        }
+
         void AppendBatch(string batch)
         {
             if (!string.IsNullOrWhiteSpace(batch))

src/dotnet-ef/Project.cs

@@ -99,10 +99,14 @@ public static Project FromFile(
 
         var designAssembly = runtimeCopyLocalItems
             .Select(i => i["FullPath"])
-            .FirstOrDefault(i => i.Contains("Microsoft.EntityFrameworkCore.Design", StringComparison.InvariantCulture));
+            .FirstOrDefault(i => i.Contains("Microsoft.EntityFrameworkCore.Design", StringComparison.InvariantCulture))
+            ?.Replace('\\', Path.DirectorySeparatorChar);
         var properties = metadata.Properties;
 
-        var outputPath = Path.GetFullPath(Path.Combine(properties[nameof(ProjectDir)]!, properties[nameof(OutputPath)]!));
+        var normalizedOutputPath = properties[nameof(OutputPath)]!.Replace('\\', Path.DirectorySeparatorChar);
+        var normalizedProjectDir = properties[nameof(ProjectDir)]!.Replace('\\', Path.DirectorySeparatorChar);
+        var normalizedProjectAssetsFile = properties[nameof(ProjectAssetsFile)]?.Replace('\\', Path.DirectorySeparatorChar);
+        var outputPath = Path.GetFullPath(Path.Combine(normalizedProjectDir, normalizedOutputPath));
         CopyBuildHost(runtimeCopyLocalItems, outputPath);
 
         var platformTarget = properties[nameof(PlatformTarget)];
@@ -116,10 +120,10 @@ public static Project FromFile(
             AssemblyName = properties[nameof(AssemblyName)],
             DesignAssembly = designAssembly,
             Language = properties[nameof(Language)],
-            OutputPath = properties[nameof(OutputPath)],
+            OutputPath = normalizedOutputPath,
             PlatformTarget = platformTarget,
-            ProjectAssetsFile = properties[nameof(ProjectAssetsFile)],
-            ProjectDir = properties[nameof(ProjectDir)],
+            ProjectAssetsFile = normalizedProjectAssetsFile,
+            ProjectDir = normalizedProjectDir,
             RootNamespace = properties[nameof(RootNamespace)],
             RuntimeFrameworkVersion = properties[nameof(RuntimeFrameworkVersion)],
             TargetFileName = properties[nameof(TargetFileName)],

src/dotnet-ef/RootCommand.cs

@@ -95,8 +95,7 @@ protected override int Execute(string[] _)
             Path.GetDirectoryName(typeof(Program).Assembly.Location)!,
             "tools");
 
-        var targetDir = Path.GetFullPath(Path.Combine(startupProject.ProjectDir!, startupProject.OutputPath!))
-            .Replace('\\', Path.DirectorySeparatorChar);
+        var targetDir = Path.GetFullPath(Path.Combine(startupProject.ProjectDir!, startupProject.OutputPath!));
         var targetPath = Path.Combine(targetDir, project.TargetFileName!);
         var startupTargetPath = Path.Combine(targetDir, startupProject.TargetFileName!);
         var depsFile = Path.Combine(