Fix references to socket APIs, and target the lowest net standard versions possible

SteveSandersonMS · SteveSandersonMS · commit 311733b11383 · 2016-06-01T18:04:40.000+01:00
diff --git a/src/Microsoft.AspNetCore.AngularServices/project.json b/src/Microsoft.AspNetCore.AngularServices/project.json
@@ -15,7 +15,7 @@
   "frameworks": {
     "net451": {
     },
-    "netstandard1.5": {
+    "netstandard1.0": {
       "imports": [
         "dotnet5.6",
         "dnxcore50",
diff --git a/src/Microsoft.AspNetCore.NodeServices/HostingModels/PhysicalConnections/NamedPipeConnection.cs b/src/Microsoft.AspNetCore.NodeServices/HostingModels/PhysicalConnections/NamedPipeConnection.cs
@@ -9,12 +9,18 @@ internal class NamedPipeConnection : StreamConnection
         private bool _disposedValue = false;
         private NamedPipeClientStream _namedPipeClientStream;
 
+#pragma warning disable 1998 // Because in the NET451 code path, there's nothing to await
         public override async Task<Stream> Open(string address)
         {
             _namedPipeClientStream = new NamedPipeClientStream(".", address, PipeDirection.InOut);
+#if NET451
+            _namedPipeClientStream.Connect();
+#else
             await _namedPipeClientStream.ConnectAsync().ConfigureAwait(false);
+#endif
             return _namedPipeClientStream;
         }
+#pragma warning restore 1998
 
         public override void Dispose()
         {
diff --git a/src/Microsoft.AspNetCore.NodeServices/HostingModels/PhysicalConnections/StreamConnection.cs b/src/Microsoft.AspNetCore.NodeServices/HostingModels/PhysicalConnections/StreamConnection.cs
@@ -1,6 +1,5 @@
 using System;
 using System.IO;
-using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 
 namespace Microsoft.AspNetCore.NodeServices.HostingModels.PhysicalConnections
@@ -12,7 +11,11 @@ internal abstract class StreamConnection : IDisposable
 
         public static StreamConnection Create()
         {
-            var useNamedPipes = RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
+#if NET451
+            return new NamedPipeConnection();
+#else
+            var useNamedPipes = System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(
+                System.Runtime.InteropServices.OSPlatform.Windows);
             if (useNamedPipes)
             {
                 return new NamedPipeConnection();
@@ -21,6 +24,7 @@ public static StreamConnection Create()
             {
                 return new UnixDomainSocketConnection();
             }
+#endif
         }
     }
 }
diff --git a/src/Microsoft.AspNetCore.NodeServices/HostingModels/PhysicalConnections/UnixDomainSocketConnection.cs b/src/Microsoft.AspNetCore.NodeServices/HostingModels/PhysicalConnections/UnixDomainSocketConnection.cs
@@ -10,6 +10,16 @@ internal class UnixDomainSocketConnection : StreamConnection
         private NetworkStream _networkStream;
         private Socket _socket;
 
+#if NET451
+        public override Task<Stream> Open(string address)
+        {
+            // The 'null' assignments avoid the compiler warnings about unassigned fields.
+            // Note that this whole class isn't supported on .NET 4.5.1, since that's not cross-platform.
+            _networkStream = null;
+            _socket = null;
+            throw new System.PlatformNotSupportedException();
+        }
+#else
         public override async Task<Stream> Open(string address)
         {
             var endPoint = new UnixDomainSocketEndPoint("/tmp/" + address);
@@ -18,6 +28,7 @@ public override async Task<Stream> Open(string address)
             _networkStream = new NetworkStream(_socket);
             return _networkStream;
         }
+#endif
 
         public override void Dispose()
         {
diff --git a/src/Microsoft.AspNetCore.NodeServices/HostingModels/PhysicalConnections/UnixDomainSocketEndPoint.cs b/src/Microsoft.AspNetCore.NodeServices/HostingModels/PhysicalConnections/UnixDomainSocketEndPoint.cs
@@ -59,7 +59,11 @@ internal UnixDomainSocketEndPoint(SocketAddress socketAddress)
             }
             else
             {
+#if NET451
+                _encodedPath = new byte[0];
+#else
                 _encodedPath = Array.Empty<byte>();
+#endif
                 _path = string.Empty;
             }
         }
diff --git a/src/Microsoft.AspNetCore.NodeServices/HostingModels/VirtualConnections/VirtualConnection.cs b/src/Microsoft.AspNetCore.NodeServices/HostingModels/VirtualConnections/VirtualConnection.cs
@@ -12,6 +12,11 @@ namespace Microsoft.AspNetCore.NodeServices.HostingModels.VirtualConnections
     /// </summary>
     internal class VirtualConnection : Stream
     {
+#if NET451
+        private readonly static Task CompletedTask = Task.FromResult((object)null);
+#else
+        private readonly static Task CompletedTask = Task.CompletedTask;
+#endif
         private VirtualConnectionClient _host;
         private readonly BufferBlock<byte[]> _receivedDataQueue = new BufferBlock<byte[]>();
         private ArraySegment<byte> _receivedDataNotYetUsed;
@@ -109,7 +114,7 @@ public override Task WriteAsync(byte[] buffer, int offset, int count, Cancellati
                 throw new InvalidOperationException("The connection was already closed by the remote party");
             }
 
-            return count > 0 ? _host.WriteAsync(Id, buffer, offset, count, cancellationToken) : Task.CompletedTask;
+            return count > 0 ? _host.WriteAsync(Id, buffer, offset, count, cancellationToken) : CompletedTask;
         }
 
         public override int Read(byte[] buffer, int offset, int count)
diff --git a/src/Microsoft.AspNetCore.NodeServices/project.json b/src/Microsoft.AspNetCore.NodeServices/project.json
@@ -15,7 +15,10 @@
   "frameworks": {
     "net451": {
       "frameworkAssemblies": {
-        "System.Net.Http": "4.0.0.0"
+        "System.Net.Http": "4.0.0-*"
+      },
+      "dependencies": {
+        "Microsoft.Tpl.Dataflow": "4.5.24"
       }
     },
     "netstandard1.3": {
@@ -27,8 +30,11 @@
       "dependencies": {
         "System.Console": "4.0.0-*",
         "System.Diagnostics.Process": "4.1.0-*",
+        "System.IO.Pipes": "4.0.0-*",
         "System.Net.Http": "4.0.1-*",
-        "System.Text.RegularExpressions": "4.0.12-*"
+        "System.Net.Sockets": "4.1.0-*",
+        "System.Text.RegularExpressions": "4.0.12-*",
+        "System.Threading.Tasks.Dataflow": "4.5.25-*"
       }
     }
   },
diff --git a/src/Microsoft.AspNetCore.ReactServices/project.json b/src/Microsoft.AspNetCore.ReactServices/project.json
@@ -15,7 +15,7 @@
   "frameworks": {
     "net451": {
     },
-    "netstandard1.5": {
+    "netstandard1.0": {
       "imports": [
         "dotnet5.6",
         "dnxcore50",
diff --git a/src/Microsoft.AspNetCore.SpaServices/project.json b/src/Microsoft.AspNetCore.SpaServices/project.json
@@ -14,7 +14,7 @@
   "frameworks": {
     "net451": {
     },
-    "netstandard1.5": {
+    "netstandard1.0": {
       "imports": [
         "dotnet5.6",
         "dnxcore50",
@@ -26,5 +26,5 @@
     "embed": [
       "Content/**/*"
     ]
-  } 
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -9,12 +9,18 @@ internal class NamedPipeConnection : StreamConnection`
`9`	`9`	`private bool _disposedValue = false;`
`10`	`10`	`private NamedPipeClientStream _namedPipeClientStream;`
`11`	`11`
	`12`	`+#pragma warning disable 1998 // Because in the NET451 code path, there's nothing to await`
`12`	`13`	`public override async Task<Stream> Open(string address)`
`13`	`14`	`{`
`14`	`15`	`_namedPipeClientStream = new NamedPipeClientStream(".", address, PipeDirection.InOut);`
	`16`	`+#if NET451`
	`17`	`+ _namedPipeClientStream.Connect();`
	`18`	`+#else`
`15`	`19`	`await _namedPipeClientStream.ConnectAsync().ConfigureAwait(false);`
	`20`	`+#endif`
`16`	`21`	`return _namedPipeClientStream;`
`17`	`22`	`}`
	`23`	`+#pragma warning restore 1998`
`18`	`24`
`19`	`25`	`public override void Dispose()`
`20`	`26`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.IO;`
`3`		`-using System.Runtime.InteropServices;`
`4`	`3`	`using System.Threading.Tasks;`
`5`	`4`
`6`	`5`	`namespace Microsoft.AspNetCore.NodeServices.HostingModels.PhysicalConnections`
`@@ -12,7 +11,11 @@ internal abstract class StreamConnection : IDisposable`
`12`	`11`
`13`	`12`	`public static StreamConnection Create()`
`14`	`13`	`{`
`15`		`- var useNamedPipes = RuntimeInformation.IsOSPlatform(OSPlatform.Windows);`
	`14`	`+#if NET451`
	`15`	`+ return new NamedPipeConnection();`
	`16`	`+#else`
	`17`	`+ var useNamedPipes = System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(`
	`18`	`+ System.Runtime.InteropServices.OSPlatform.Windows);`
`16`	`19`	`if (useNamedPipes)`
`17`	`20`	`{`
`18`	`21`	`return new NamedPipeConnection();`
`@@ -21,6 +24,7 @@ public static StreamConnection Create()`
`21`	`24`	`{`
`22`	`25`	`return new UnixDomainSocketConnection();`
`23`	`26`	`}`
	`27`	`+#endif`
`24`	`28`	`}`
`25`	`29`	`}`
`26`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,11 @@ internal UnixDomainSocketEndPoint(SocketAddress socketAddress)`
`59`	`59`	`}`
`60`	`60`	`else`
`61`	`61`	`{`
	`62`	`+#if NET451`
	`63`	`+ _encodedPath = new byte[0];`
	`64`	`+#else`
`62`	`65`	`_encodedPath = Array.Empty<byte>();`
	`66`	`+#endif`
`63`	`67`	`_path = string.Empty;`
`64`	`68`	`}`
`65`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,11 @@ namespace Microsoft.AspNetCore.NodeServices.HostingModels.VirtualConnections`
`12`	`12`	`/// </summary>`
`13`	`13`	`internal class VirtualConnection : Stream`
`14`	`14`	`{`
	`15`	`+#if NET451`
	`16`	`+ private readonly static Task CompletedTask = Task.FromResult((object)null);`
	`17`	`+#else`
	`18`	`+ private readonly static Task CompletedTask = Task.CompletedTask;`
	`19`	`+#endif`
`15`	`20`	`private VirtualConnectionClient _host;`
`16`	`21`	`private readonly BufferBlock<byte[]> _receivedDataQueue = new BufferBlock<byte[]>();`
`17`	`22`	`private ArraySegment<byte> _receivedDataNotYetUsed;`
`@@ -109,7 +114,7 @@ public override Task WriteAsync(byte[] buffer, int offset, int count, Cancellati`
`109`	`114`	`throw new InvalidOperationException("The connection was already closed by the remote party");`
`110`	`115`	`}`
`111`	`116`
`112`		`- return count > 0 ? _host.WriteAsync(Id, buffer, offset, count, cancellationToken) : Task.CompletedTask;`
	`117`	`+ return count > 0 ? _host.WriteAsync(Id, buffer, offset, count, cancellationToken) : CompletedTask;`
`113`	`118`	`}`
`114`	`119`
`115`	`120`	`public override int Read(byte[] buffer, int offset, int count)`