Merge pull request #207 from ali-ince/1.5

support .net framework 4.5 alongside .net standard 1.3 platforms
neo4j · Aug 1, 2017 · 9fd27c1 · 9fd27c1
2 parents 529c70c + fdbd015
commit 9fd27c1
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 7 deletions.
diff --git a/Neo4j.Driver/Neo4j.Driver/Internal/Connector/SocketConnection.cs b/Neo4j.Driver/Neo4j.Driver/Internal/Connector/SocketConnection.cs
@@ -227,7 +227,13 @@ public void Close()
         public Task CloseAsync()
         {
             Close();
-            return Task.CompletedTask; // TODO verify this is the correct way to do it
+
+// TODO verify this is the correct way to do it
+#if NET45
+            return Task.FromResult(0);
+#else
+            return Task.CompletedTask;
+#endif
         }
 
         private void AssertNoServerFailure()

diff --git a/Neo4j.Driver/Neo4j.Driver/Internal/Connector/TcpSocketClient.cs b/Neo4j.Driver/Neo4j.Driver/Internal/Connector/TcpSocketClient.cs
@@ -123,7 +123,12 @@ protected virtual void Dispose(bool isDisposing)
         private void Close()
         {
             _stream?.Dispose();
+
+#if NET45
+            _client?.Close();
+#else
             _client?.Dispose();
+#endif
         }
 
         /// <summary>Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.</summary>

diff --git a/Neo4j.Driver/Neo4j.Driver/Internal/Transaction.cs b/Neo4j.Driver/Neo4j.Driver/Internal/Transaction.cs
@@ -291,7 +291,11 @@ public override void Close()
             public override Task CloseAsync()
             {
                 Close();
+#if NET45
+            return Task.FromResult(0);
+#else
                 return Task.CompletedTask;
+#endif
             }
 
             public override void OnError(Exception error)

diff --git a/Neo4j.Driver/Neo4j.Driver/Neo4j.Driver.csproj b/Neo4j.Driver/Neo4j.Driver/Neo4j.Driver.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard1.3;net46</TargetFrameworks>
+    <TargetFrameworks>netstandard1.3;net45</TargetFrameworks>
     <AssemblyName>Neo4j.Driver</AssemblyName>
     <PackageId>Neo4j.Driver</PackageId>
     <Authors>Neo4j</Authors>
@@ -32,14 +32,12 @@
   <PropertyGroup Condition="'$(Configuration)|$(TargetFramework)|$(Platform)'=='Release|netstandard1.3|AnyCPU'">
     <DocumentationFile>bin\Release\netstandard1.3\Neo4j.Driver.xml</DocumentationFile>
   </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
-    <PackageReference Include="System.Net.Security" Version="4.3.1" />
-    <PackageReference Include="System.Net.Sockets" Version="4.3.0" />
-  </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.3'">
     <PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
+    <PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
+    <PackageReference Include="System.Net.Security" Version="4.3.1" />
+    <PackageReference Include="System.Net.Sockets" Version="4.3.0" />
   </ItemGroup>
 
 </Project>