Depend on Npgsql 4.0.2

Author: roji

src/EntityFramework6.Npgsql/EntityFramework6.Npgsql.csproj

@@ -39,7 +39,7 @@
     <Reference Include="System.ComponentModel.DataAnnotations" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Npgsql" Version="3.2.5" />
+    <PackageReference Include="Npgsql" Version="4.0.2" />
     <PackageReference Include="EntityFramework" Version="6.2.0" />
   </ItemGroup>
 </Project>

src/EntityFramework6.Npgsql/NpgsqlProviderManifest.cs

@@ -79,7 +79,7 @@ internal static NpgsqlDbType GetNpgsqlDbType(PrimitiveTypeKind primitiveType)
             case PrimitiveTypeKind.DateTime:
                 return NpgsqlDbType.Timestamp;
             case PrimitiveTypeKind.DateTimeOffset:
-                return NpgsqlDbType.TimestampTZ;
+                return NpgsqlDbType.TimestampTz;
             case PrimitiveTypeKind.Decimal:
                 return NpgsqlDbType.Numeric;
             case PrimitiveTypeKind.Double:

test/EntityFramework6.Npgsql.Tests/App.config

@@ -25,4 +25,12 @@
       <add name="Npgsql Data Provider" invariant="Npgsql" support="FF" description=".Net Framework Data Provider for Postgresql" type="Npgsql.NpgsqlFactory, Npgsql" />
     </DbProviderFactories>
   </system.data>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Npgsql" publicKeyToken="5d8b90d52f46fda7" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.2.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
 </configuration>

test/EntityFramework6.Npgsql.Tests/EntityFramework6.Npgsql.Tests.csproj

@@ -11,5 +11,6 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
     <PackageReference Include="NLog" Version="4.4.12" />
+    <PackageReference Include="Npgsql.LegacyPostgis" Version="1.0.0" />
   </ItemGroup>
 </Project>

test/EntityFramework6.Npgsql.Tests/Spatial/PostgisServiceTests.cs

@@ -1,7 +1,7 @@
 using System;
 using Npgsql;
+using Npgsql.LegacyPostgis;
 using Npgsql.Spatial;
-using NpgsqlTypes;
 using NUnit.Framework;
 // ReSharper disable RedundantExplicitArrayCreation
 
@@ -1321,6 +1321,7 @@ PostgisServices CreatePostgisServices()
 
             using (var conn = new NpgsqlConnection(ConnectionString))
             {
+                NpgsqlConnection.GlobalTypeMapper.UseLegacyPostgis();
                 conn.Open();
                 using (var cmd = new NpgsqlCommand("CREATE EXTENSION IF NOT EXISTS postgis", conn))
                     cmd.ExecuteNonQuery();