Remove SqlDataReader dependency from SqlServerGeometryTypeMapping

src/EFCore.SqlServer.NTS/Storage/Internal/SqlServerGeometryTypeMapping.cs

@@ -23,7 +23,8 @@ public class SqlServerGeometryTypeMapping<TGeometry> : RelationalGeometryTypeMap
     where TGeometry : Geometry
 {
     private static readonly MethodInfo _getSqlBytes
-        = typeof(SqlDataReader).GetRuntimeMethod(nameof(SqlDataReader.GetSqlBytes), [typeof(int)])!;
+        = typeof(DbDataReader).GetRuntimeMethod(nameof(DbDataReader.GetFieldValue), [typeof(int)])!
+            .MakeGenericMethod(typeof(SqlBytes));
 
     private static Action<DbParameter, SqlDbType>? _sqlDbTypeSetter;
     private static Action<DbParameter, string>? _udtTypeNameSetter;

test/EFCore.SqlServer.Tests/Storage/Internal/SqlServerGeometryTypeMappingTests.cs

@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System.Data.Common;
+using System.Data.SqlTypes;
 using NetTopologySuite;
 using NetTopologySuite.Geometries;
 
@@ -20,6 +22,19 @@ public void GenerateSqlLiteral_works()
         Assert.Equal("geometry::Parse('POINT (1 2 NULL 3)')", Literal(new Point(new CoordinateM(1, 2, 3)), "geometry"));
     }
 
+    [ConditionalFact]
+    public void GetDataReaderMethod_works_with_DbDataReader()
+    {
+        var mapping = new SqlServerGeometryTypeMapping<Geometry>(NtsGeometryServices.Instance, "geometry");
+        var method = mapping.GetDataReaderMethod();
+
+        Assert.NotNull(method);
+        Assert.Equal("GetFieldValue", method.Name);
+        Assert.Equal(typeof(DbDataReader), method.DeclaringType);
+        Assert.True(method.IsGenericMethod);
+        Assert.Equal(typeof(SqlBytes), method.GetGenericArguments()[0]);
+    }
+
     private static string Literal(Geometry value, string storeType)
         => new SqlServerGeometryTypeMapping<Geometry>(NtsGeometryServices.Instance, storeType)
             .GenerateSqlLiteral(value);