[6.0] Fix SQL Server NTS scaffolding code generation

src/EFCore.SqlServer.NTS/Scaffolding/Internal/SqlServerNetTopologySuiteCodeGeneratorPlugin.cs

@@ -20,7 +20,7 @@ public class SqlServerNetTopologySuiteCodeGeneratorPlugin : ProviderCodeGenerato
         private static readonly MethodInfo _useNetTopologySuiteMethodInfo
             = typeof(SqlServerNetTopologySuiteDbContextOptionsBuilderExtensions).GetRequiredRuntimeMethod(
                 nameof(SqlServerNetTopologySuiteDbContextOptionsBuilderExtensions.UseNetTopologySuite),
-                typeof(Action<SqlServerDbContextOptionsBuilder>));
+                typeof(SqlServerDbContextOptionsBuilder));
 
         /// <summary>
         ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to

test/EFCore.SqlServer.Tests/Scaffolding/SqlServerCodeGeneratorTest.cs

@@ -55,6 +55,29 @@ public virtual void Use_provider_method_is_generated_correctly_with_options()
             Assert.Null(result.ChainedCall);
         }
 
+        [ConditionalFact]
+        public virtual void Use_provider_method_is_generated_correctly_with_NetTopologySuite()
+        {
+            var codeGenerator = new SqlServerCodeGenerator(
+                new ProviderCodeGeneratorDependencies(
+                    new[] { new SqlServerNetTopologySuiteCodeGeneratorPlugin() }));
+
+            var result = ((IProviderConfigurationCodeGenerator)codeGenerator).GenerateUseProvider("Data Source=Test");
+
+            Assert.Equal("UseSqlServer", result.Method);
+            Assert.Collection(
+                result.Arguments,
+                a => Assert.Equal("Data Source=Test", a),
+                a =>
+                {
+                    var nestedClosure = Assert.IsType<NestedClosureCodeFragment>(a);
+
+                    Assert.Equal("x", nestedClosure.Parameter);
+                    Assert.Equal("UseNetTopologySuite", nestedClosure.MethodCalls[0].Method);
+                });
+            Assert.Null(result.ChainedCall);
+        }
+
         private static readonly MethodInfo _setProviderOptionMethodInfo
             = typeof(SqlServerCodeGeneratorTest).GetRuntimeMethod(nameof(SetProviderOption), new[] { typeof(DbContextOptionsBuilder) });
 

test/EFCore.Sqlite.Tests/Scaffolding/SqliteCodeGeneratorTest.cs

@@ -54,6 +54,29 @@ public virtual void Use_provider_method_is_generated_correctly_with_options()
             Assert.Null(result.ChainedCall);
         }
 
+        [ConditionalFact]
+        public virtual void Use_provider_method_is_generated_correctly_with_NetTopologySuite()
+        {
+            var codeGenerator = new SqliteCodeGenerator(
+                new ProviderCodeGeneratorDependencies(
+                    new[] { new SqliteNetTopologySuiteCodeGeneratorPlugin() }));
+
+            var result = ((IProviderConfigurationCodeGenerator)codeGenerator).GenerateUseProvider("Data Source=Test");
+
+            Assert.Equal("UseSqlite", result.Method);
+            Assert.Collection(
+                result.Arguments,
+                a => Assert.Equal("Data Source=Test", a),
+                a =>
+                {
+                    var nestedClosure = Assert.IsType<NestedClosureCodeFragment>(a);
+
+                    Assert.Equal("x", nestedClosure.Parameter);
+                    Assert.Equal("UseNetTopologySuite", nestedClosure.MethodCalls[0].Method);
+                });
+            Assert.Null(result.ChainedCall);
+        }
+
         private static readonly MethodInfo _setProviderOptionMethodInfo
             = typeof(SqliteCodeGeneratorTest).GetRuntimeMethod(nameof(SetProviderOption), new[] { typeof(DbContextOptionsBuilder) });