Merge pull request #128 from nhibernate/sql-client

Replace System.Data.SqlClient with Microsoft.Data.SqlClient

Author: peetw

NHibernate.Spatial.MsSql/NHibernate.Spatial.MsSql.csproj

@@ -19,8 +19,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NetTopologySuite.IO.SqlServerBytes" Version="2.0.0" />
-    <PackageReference Include="System.Data.SqlClient" Version="4.8.2" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="4.1.0" />
+    <PackageReference Include="NetTopologySuite.IO.SqlServerBytes" Version="2.1.0" />
   </ItemGroup>
 
   <ItemGroup>

NHibernate.Spatial.MsSql/Type/MsSqlGeometryType.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Data;
 using System.Data.Common;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 using NetTopologySuite.Geometries;
 using NetTopologySuite.IO;
 using NHibernate.Engine;

Tests.NHibernate.Spatial.MsSql2008/README.md

@@ -4,24 +4,24 @@ In order to run the tests, a MS SQL Server 2008 instance must be available for c
 
 ### Installation
 
-MS SQL Server 2008 Express with Tools is free and can be downloaded from the [MS website](https://www.microsoft.com/en-us/download/details.aspx?id=22973).
+MS SQL Server 2008 Express with Tools is free and can be downloaded from the [MS website](https://www.microsoft.com/en-us/download/details.aspx?id=30438) (download and install the `SQLEXPRWT_x64_ENU.exe` package).
 
 ### Configuration
 
 Once MS SQL Server 2008 has been set up, it must be initialized for testing:
 
 1. Ensure that the "Server authentication" is set to "SQL Server and Windows Authentication mode" (see image below).
 
-![Server authentication](http://i.imgur.com/SxkyVpx.png)
+![Server authentication](https://i.imgur.com/SxkyVpx.png)
 
 2. After changing the authentication mode, the server must be restarted for the changes to take effect (this can be done via the "SQL Server Configuration Manager").
 
 3. Add a new `nhsp_test` user, using SQL Server authentication with `nhsp_test` for the password and making sure to untick "Enforce password policy" (see image below).
 
-![Create new user](http://i.imgur.com/VIOArTc.png)
+![Create new user](https://i.imgur.com/VIOArTc.png)
 
 4. Create a new `nhsp_test` database, owned by the `nhsp_test` user (see image below).
 
-![Create new database](http://i.imgur.com/93mrjwn.png)
+![Create new database](https://i.imgur.com/93mrjwn.png)
 
-5. Finally, the `Server=.` part of the connection string in the [app.config](app.config) file should be updated with the name of your server instance, e.g. `Server=hostname\MSSQLSERVER2008`.
+5. Finally, the `Server=.` part of the connection string in the [appsettings.json](appsettings.json) file should be updated with the name of your server instance, e.g. `Server=hostname\MSSQLSERVER2008`.

Tests.NHibernate.Spatial.MsSql2008/TestConfiguration.cs

@@ -25,7 +25,7 @@ public static void Configure(Configuration configuration)
                 [Environment.ProxyFactoryFactoryClass] = typeof(StaticProxyFactoryFactory).AssemblyQualifiedName,
                 [Environment.Dialect] = typeof(MsSql2008GeometryDialect).AssemblyQualifiedName,
                 [Environment.ConnectionProvider] = typeof(DebugConnectionProvider).AssemblyQualifiedName,
-                [Environment.ConnectionDriver] = typeof(SqlClientDriver).AssemblyQualifiedName,
+                [Environment.ConnectionDriver] = typeof(MicrosoftDataSqlClientDriver).AssemblyQualifiedName,
                 [Environment.ConnectionString] = _configurationRoot.GetConnectionString("MsSql2008")
             };
             configuration.SetProperties(properties);

Tests.NHibernate.Spatial.MsSql2008/appsettings.json

@@ -1,6 +1,7 @@
 {
   "ConnectionStrings": {
-    "_comment": " NOTE: Must specify SQL Server 2012 rather than SQL Server 2008 for the Type System Version attribute (see issue #72)",
-    "MsSql2008": "Server=(local)\\SQL2008R2SP2;Initial Catalog=nhsp_test;User ID=nhsp_test;Password=nhsp_test;Type System Version=SQL Server 2012"
+    "_comment1": "NOTE: Must specify SQL Server 2012 rather than SQL Server 2008 for the Type System Version attribute (see issue #72)",
+    "_comment2": "NOTE: TrustServerCertificate=True required after updating from System.Data.Sql to Microsoft.Data.Sql as Encrypt is now set to true by default; see: https://stackoverflow.com/a/17658821/3628232",
+    "MsSql2008": "Server=(local)\\MSSQLSERVER2008;Initial Catalog=nhsp_test;User ID=nhsp_test;Password=nhsp_test;Type System Version=SQL Server 2012;TrustServerCertificate=True"
   }
 }

Tests.NHibernate.Spatial.MsSql2012/README.md

@@ -4,24 +4,24 @@ In order to run the tests, a MS SQL Server 2012 instance must be available for c
 
 ### Installation
 
-MS SQL Server 2012 Express with Tools is free and can be downloaded from the [MS website]().
+MS SQL Server 2012 Express with Tools is free and can be downloaded from the [MS website](https://www.microsoft.com/en-us/download/details.aspx?id=50003) (download and install the `SQLEXPRWT_x64_ENU.exe` package).
 
 ### Configuration
 
 Once MS SQL Server 2012 has been set up, it must be initialized for testing:
 
 1. Ensure that the "Server authentication" is set to "SQL Server and Windows Authentication mode" (see image below).
 
-![Server authentication](http://i.imgur.com/SxkyVpx.png)
+![Server authentication](https://i.imgur.com/SxkyVpx.png)
 
 2. After changing the authentication mode, the server must be restarted for the changes to take effect (this can be done via the "SQL Server Configuration Manager").
 
 3. Add a new `nhsp_test` user, using SQL Server authentication with `nhsp_test` for the password and making sure to untick "Enforce password policy" (see image below).
 
-![Create new user](http://i.imgur.com/VIOArTc.png)
+![Create new user](https://i.imgur.com/VIOArTc.png)
 
 4. Create a new `nhsp_test` database, owned by the `nhsp_test` user (see image below).
 
-![Create new database](http://i.imgur.com/93mrjwn.png)
+![Create new database](https://i.imgur.com/93mrjwn.png)
 
-5. Finally, the `Server=.` part of the connection string in the [app.config](app.config) file should be updated with the name of your server instance, e.g. `Server=(local)\MSSQLSERVER2012`.
+5. Finally, the `Server=.` part of the connection string in the [appsettings.json](appsettings.json) file should be updated with the name of your server instance, e.g. `Server=(local)\MSSQLSERVER2012`.

Tests.NHibernate.Spatial.MsSql2012/TestConfiguration.cs

@@ -25,7 +25,7 @@ public static void Configure(Configuration configuration)
                 [Environment.ProxyFactoryFactoryClass] = typeof(StaticProxyFactoryFactory).AssemblyQualifiedName,
                 [Environment.Dialect] = typeof(MsSql2012GeometryDialect).AssemblyQualifiedName,
                 [Environment.ConnectionProvider] = typeof(DebugConnectionProvider).AssemblyQualifiedName,
-                [Environment.ConnectionDriver] = typeof(SqlClientDriver).AssemblyQualifiedName,
+                [Environment.ConnectionDriver] = typeof(MicrosoftDataSqlClientDriver).AssemblyQualifiedName,
                 [Environment.ConnectionString] = _configurationRoot.GetConnectionString("MsSql2012")
             };
             configuration.SetProperties(properties);

Tests.NHibernate.Spatial.MsSql2012/appsettings.json

@@ -1,5 +1,6 @@
 {
   "ConnectionStrings": {
-    "MsSql2012": "Server=(local)\\SQL2012SP1;Initial Catalog=nhsp_test;User ID=nhsp_test;Password=nhsp_test;Type System Version=SQL Server 2012"
+    "_comment": "NOTE: TrustServerCertificate=True required after updating from System.Data.Sql to Microsoft.Data.Sql as Encrypt is now set to true by default; see: https://stackoverflow.com/a/17658821/3628232",
+    "MsSql2012": "Server=(local)\\MSSQLSERVER2012;Initial Catalog=nhsp_test;User ID=nhsp_test;Password=nhsp_test;Type System Version=SQL Server 2012;TrustServerCertificate=True"
   }
 }

appveyor.yml

@@ -11,21 +11,21 @@ image:
 install:
   # install SQL Server 2008 R2 SP2 Express (not included in VS 2017 image; see: https://www.appveyor.com/docs/build-environment/#databases)
   - cmd: curl -L -O -S -s https://download.microsoft.com/download/0/4/B/04BE03CD-EAF3-4797-9D8D-2E08E316C998/SQLEXPR_x64_ENU.exe
-  - cmd: SQLEXPR_x64_ENU.exe /QUIET /IACCEPTSQLSERVERLICENSETERMS /ACTION=INSTALL /FEATURES=SQL /INSTANCENAME=SQL2008R2SP2 /TCPENABLED=1 /SECURITYMODE=SQL /SAPWD=Password12! /ADDCURRENTUSERASSQLADMIN /SQLSVCACCOUNT="NT AUTHORITY\Network Service" /AGTSVCACCOUNT="NT AUTHORITY\Network Service"
+  - cmd: SQLEXPR_x64_ENU.exe /QUIET /IACCEPTSQLSERVERLICENSETERMS /ACTION=INSTALL /FEATURES=SQL /INSTANCENAME=MSSQLSERVER2008 /TCPENABLED=1 /SECURITYMODE=SQL /SAPWD=Password12! /ADDCURRENTUSERASSQLADMIN /SQLSVCACCOUNT="NT AUTHORITY\Network Service" /AGTSVCACCOUNT="NT AUTHORITY\Network Service"
 
   # install SQL Server 2012 SP1 Express (not included in VS 2017 image; see: https://www.appveyor.com/docs/build-environment/#databases)
   - cmd: curl -L -O -S -s https://download.microsoft.com/download/5/2/9/529FEF7B-2EFB-439E-A2D1-A1533227CD69/SQLEXPR_x64_ENU.exe
-  - cmd: SQLEXPR_x64_ENU.exe /QUIET /IACCEPTSQLSERVERLICENSETERMS /ACTION=INSTALL /FEATURES=SQL /INSTANCENAME=SQL2012SP1 /TCPENABLED=1 /SECURITYMODE=SQL /SAPWD=Password12! /ADDCURRENTUSERASSQLADMIN /SQLSVCACCOUNT="NT AUTHORITY\Network Service" /AGTSVCACCOUNT="NT AUTHORITY\Network Service"
+  - cmd: SQLEXPR_x64_ENU.exe /QUIET /IACCEPTSQLSERVERLICENSETERMS /ACTION=INSTALL /FEATURES=SQL /INSTANCENAME=MSSQLSERVER2012 /TCPENABLED=1 /SECURITYMODE=SQL /SAPWD=Password12! /ADDCURRENTUSERASSQLADMIN /SQLSVCACCOUNT="NT AUTHORITY\Network Service" /AGTSVCACCOUNT="NT AUTHORITY\Network Service"
 
   # install x86 CLR types for SQL Server 2012 SP1 (required when running dotnet test for MsSql tests)
   - cmd: curl -L -O -S -s https://download.microsoft.com/download/F/E/D/FEDB200F-DE2A-46D8-B661-D019DFE9D470/ENU/x86/SQLSysClrTypes.msi
   - cmd: SQLSysClrTypes.msi /passive
 
   # enable dynamic TCP ports for 2008 and 2012 SQL Server instances (so they can be run simultaneously)
-  - ps: if ($isWindows) { set-itemproperty -path 'HKLM:\software\microsoft\microsoft sql server\mssql10_50.SQL2008R2SP2\mssqlserver\supersocketnetlib\tcp\ipall' -name TcpDynamicPorts -value '0' }
-  - ps: if ($isWindows) { set-itemproperty -path 'HKLM:\software\microsoft\microsoft sql server\mssql10_50.SQL2008R2SP2\mssqlserver\supersocketnetlib\tcp\ipall' -name TcpPort -value '' }
-  - ps: if ($isWindows) { set-itemproperty -path 'HKLM:\software\microsoft\microsoft sql server\mssql11.SQL2012SP1\mssqlserver\supersocketnetlib\tcp\ipall' -name TcpDynamicPorts -value '0' }
-  - ps: if ($isWindows) { set-itemproperty -path 'HKLM:\software\microsoft\microsoft sql server\mssql11.SQL2012SP1\mssqlserver\supersocketnetlib\tcp\ipall' -name TcpPort -value '' }
+  - ps: if ($isWindows) { set-itemproperty -path 'HKLM:\software\microsoft\microsoft sql server\mssql10_50.MSSQLSERVER2008\mssqlserver\supersocketnetlib\tcp\ipall' -name TcpDynamicPorts -value '0' }
+  - ps: if ($isWindows) { set-itemproperty -path 'HKLM:\software\microsoft\microsoft sql server\mssql10_50.MSSQLSERVER2008\mssqlserver\supersocketnetlib\tcp\ipall' -name TcpPort -value '' }
+  - ps: if ($isWindows) { set-itemproperty -path 'HKLM:\software\microsoft\microsoft sql server\mssql11.MSSQLSERVER2012\mssqlserver\supersocketnetlib\tcp\ipall' -name TcpDynamicPorts -value '0' }
+  - ps: if ($isWindows) { set-itemproperty -path 'HKLM:\software\microsoft\microsoft sql server\mssql11.MSSQLSERVER2012\mssqlserver\supersocketnetlib\tcp\ipall' -name TcpPort -value '' }
 
   # install MySQL 5.6
   # - cmd: curl -L -O -S -s https://dev.mysql.com/get/Downloads/MySQLInstaller/mysql-installer-web-community-5.6.36.0.msi
@@ -89,10 +89,10 @@ before_build:
 # scripts to run before tests
 before_test:
   # setup SQL Server 2008
-  - cmd: sqlcmd -S (local)\SQL2008R2SP2 -i Tests.NHibernate.Spatial.MsSql2008\nhsp_test.sql
+  - cmd: sqlcmd -S (local)\MSSQLSERVER2008 -i Tests.NHibernate.Spatial.MsSql2008\nhsp_test.sql
 
   # setup SQL Server 2012
-  - cmd: sqlcmd -S (local)\SQL2012SP1 -i Tests.NHibernate.Spatial.MsSql2012\nhsp_test.sql
+  - cmd: sqlcmd -S (local)\MSSQLSERVER2012 -i Tests.NHibernate.Spatial.MsSql2012\nhsp_test.sql
 
   # setup MySQL 5.6
   # - cmd: net start mysql56