Fix for dotMorten#51

yorek · Oct 8, 2020 · a194bf3 · a194bf3
1 parent 8d40044
commit a194bf3
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 22 deletions.
diff --git a/src/Microsoft.SqlServer.Types.Tests/Geography/WktTests.cs b/src/Microsoft.SqlServer.Types.Tests/Geography/WktTests.cs
@@ -1,6 +1,11 @@
 using Microsoft.SqlServer.Types.Tests.Geometry;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using System.Data.SqlTypes;
+#if NETCOREAPP
+using Microsoft.Data.SqlClient;
+#else
+using System.Data.SqlClient;
+#endif
 
 namespace Microsoft.SqlServer.Types.Tests.Geography
 {
@@ -14,7 +19,7 @@ public class WktTests
         [WorkItem(13)]
         public void UserSubmittedIssue_WKT2()
         {
-            using (var conn = new System.Data.SqlClient.SqlConnection(DBTests.ConnectionString))
+            using (var conn = new SqlConnection(DBTests.ConnectionString))
             {
                 conn.Open();
                 var id = SqlGeography.Parse("LINESTRING (-122.36 47.656, -122.343 47.656)");
@@ -38,7 +43,7 @@ public void UserSubmittedIssue_WKT2()
         [WorkItem(13)]
         public void UserSubmittedIssue_WKT3()
         {
-            using (var conn = new System.Data.SqlClient.SqlConnection(DBTests.ConnectionString))
+            using (var conn = new SqlConnection(DBTests.ConnectionString))
             {
                 conn.Open();
                 var id = SqlGeography.Parse("LINESTRING (-122.36 47.656, -122.343 47.656)");
@@ -56,7 +61,7 @@ public void UserSubmittedIssue_WKT3()
         [WorkItem(14)]
         public void UserSubmittedIssue_WKT4()
         {
-            using (var conn = new System.Data.SqlClient.SqlConnection(DBTests.ConnectionString))
+            using (var conn = new SqlConnection(DBTests.ConnectionString))
             {
                 conn.Open();
                 using (var cmd = conn.CreateCommand())

diff --git a/src/Microsoft.SqlServer.Types.Tests/Geometry/DBTests.cs b/src/Microsoft.SqlServer.Types.Tests/Geometry/DBTests.cs
@@ -4,12 +4,16 @@
 using System.Collections.Generic;
 using System.Data;
 using System.Data.Common;
-using System.Data.SqlClient;
 using System.Data.SqlTypes;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Text;
+#if NETCOREAPP
+using Microsoft.Data.SqlClient;
+#else
+using System.Data.SqlClient;
+#endif
 
 namespace Microsoft.SqlServer.Types.Tests.Geometry
 {
@@ -20,7 +24,7 @@ public class DBTests : IDisposable
     {
         const string connstr = @"Data Source=(localdb)\mssqllocaldb;Integrated Security=True;AttachDbFileName=";
 
-        private System.Data.SqlClient.SqlConnection conn;
+        private SqlConnection conn;
         private static string path;
         private static object lockObj = new object();
         static DBTests()
@@ -34,7 +38,7 @@ public static void Init()
             {
                 path = Path.Combine(new FileInfo(typeof(DBTests).Assembly.Location).Directory.FullName, "UnitTestData.mdf");
                 CreateSqlDatabase(path);
-                using (var conn = new System.Data.SqlClient.SqlConnection(connstr + path))
+                using (var conn = new SqlConnection(connstr + path))
                 {
                     conn.Open();
                     var cmd = conn.CreateCommand();
@@ -54,7 +58,7 @@ public static void Init()
         public DBTests()
         {
             Init();
-            conn = new System.Data.SqlClient.SqlConnection(ConnectionString);
+            conn = new SqlConnection(ConnectionString);
             conn.Open();
         }
 
@@ -65,7 +69,7 @@ private static void CreateSqlDatabase(string filename)
                 File.Delete(filename);
             if (File.Exists(filename.Replace(".mdf","_log.ldf")))
                 File.Delete(filename.Replace(".mdf", "_log.ldf"));
-            using (var connection = new System.Data.SqlClient.SqlConnection(
+            using (var connection = new SqlConnection(
                 @"Data Source=(localdb)\mssqllocaldb;Initial Catalog=master; Integrated Security=true;"))
             {
                 connection.Open();

diff --git a/src/Microsoft.SqlServer.Types.Tests/Geometry/WktTests.cs b/src/Microsoft.SqlServer.Types.Tests/Geometry/WktTests.cs
@@ -1,5 +1,10 @@
 using System;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
+#if NETCOREAPP
+using Microsoft.Data.SqlClient;
+#else
+using System.Data.SqlClient;
+#endif
 
 namespace Microsoft.SqlServer.Types.Tests.Geometry
 {
@@ -107,7 +112,7 @@ public void EmptyGeometriesFromString(string parameter)
         [TestMethod]
         public void MultiLineStringFromString()
         {
-            using (var conn = new System.Data.SqlClient.SqlConnection(DBTests.ConnectionString))
+            using (var conn = new SqlConnection(DBTests.ConnectionString))
             {
                 conn.Open();
                 using (var cmd = conn.CreateCommand())
@@ -183,7 +188,7 @@ public void GeometryCollectionFromString()
         [WorkItem(13)]
         public void UserSubmittedIssue_WKT1()
         {
-            using (var conn = new System.Data.SqlClient.SqlConnection(DBTests.ConnectionString))
+            using (var conn = new SqlConnection(DBTests.ConnectionString))
             {
                 conn.Open();
                 var id = SqlGeometry.Parse("LINESTRING (100 100, 20 180, 180 180)");

diff --git a/src/Microsoft.SqlServer.Types.Tests/Microsoft.SqlServer.Types.Tests.csproj b/src/Microsoft.SqlServer.Types.Tests/Microsoft.SqlServer.Types.Tests.csproj
@@ -27,6 +27,7 @@
   <ItemGroup Condition="'$(TargetFramework)'=='netcoreapp2.1'">
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
     <ProjectReference Include="..\Microsoft.SqlServer.Types\Microsoft.SqlServer.Types.csproj" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="2.0.1" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)'=='net461'">
     <PackageReference Include="Microsoft.SqlServer.Types" Version="14.0.1016.290" />

diff --git a/src/Microsoft.SqlServer.Types/ISqlSpatialGridIndexable.cs b/src/Microsoft.SqlServer.Types/ISqlSpatialGridIndexable.cs
@@ -1,4 +1,4 @@
-using Microsoft.SqlServer.Server;
+using Microsoft.Data.SqlClient.Server;
 
 namespace Microsoft.SqlServer.Types
 {

diff --git a/src/Microsoft.SqlServer.Types/Microsoft.SqlServer.Types.csproj b/src/Microsoft.SqlServer.Types/Microsoft.SqlServer.Types.csproj
@@ -21,10 +21,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Data.SqlClient">
-      <Version>4.5.1</Version>
-    </PackageReference>
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="2.0.1" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
-    <PackageReference Include="System.Memory" Version="4.5.1" />
+    <PackageReference Include="System.Memory" Version="4.5.4" />
   </ItemGroup>
 </Project>
diff --git a/src/Microsoft.SqlServer.Types/SqlGeography.cs b/src/Microsoft.SqlServer.Types/SqlGeography.cs
@@ -1,4 +1,4 @@
-using Microsoft.SqlServer.Server;
+using Microsoft.Data.SqlClient.Server;
 using System;
 using System.Data.SqlTypes;
 using System.IO;

diff --git a/src/Microsoft.SqlServer.Types/SqlGeometry.cs b/src/Microsoft.SqlServer.Types/SqlGeometry.cs
@@ -1,4 +1,4 @@
-using Microsoft.SqlServer.Server;
+using Microsoft.Data.SqlClient.Server;
 using System;
 using System.Collections.Generic;
 using System.Data.SqlTypes;
@@ -206,10 +206,10 @@ public SqlInt32 STNumCurves()
         {
             if (IsNull || _geometry.IsEmpty) return SqlInt32.Null;
 
-            if (_geometry.Type == OGCGeometryType.LineString)
-                return _geometry.IsEmpty ? 0 : _geometry.NumPoints - 1;
+            if (_geometry.Type == OGCGeometryType.LineString)
+                return _geometry.IsEmpty ? 0 : _geometry.NumPoints - 1;
 
-            if (_geometry.Type == OGCGeometryType.CircularString)
+            if (_geometry.Type == OGCGeometryType.CircularString)
             {
                 if (_geometry.IsEmpty) return 0;
                 return (_geometry.NumPoints - 1) / 2;
@@ -218,7 +218,7 @@ public SqlInt32 STNumCurves()
                 return _geometry.NumRings;
             if (_geometry.Type != OGCGeometryType.CompoundCurve)
                 return SqlInt32.Null;
-            return _geometry.NumSegments;
+            return _geometry.NumSegments;
         }
 
         /// <summary>

diff --git a/src/Microsoft.SqlServer.Types/SqlHierarchyId.cs b/src/Microsoft.SqlServer.Types/SqlHierarchyId.cs
@@ -1,4 +1,4 @@
-using Microsoft.SqlServer.Server;
+using Microsoft.Data.SqlClient.Server;
 using Microsoft.SqlServer.Types.SqlHierarchy;
 using System;
 using System.Collections;