Transition to netstandard.

- dotnet5.X => netstandard1.y (where y = x-1).
- DNXCore50 => netstandardapp1.5.
- Applied the same changes to ifdefs.

src/Microsoft.AspNetCore.WebSockets.Protocol/project.json

@@ -8,12 +8,14 @@
   "compilationOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk",
-    "nowarn": [ "CS1591" ],
+    "nowarn": [
+      "CS1591"
+    ],
     "xmlDoc": true
   },
   "frameworks": {
     "net451": {},
-    "dotnet5.4": {
+    "netstandard1.3": {
       "dependencies": {
         "System.Diagnostics.Contracts": "4.0.1-*",
         "System.IO": "4.1.0-*",
@@ -26,7 +28,10 @@
         "System.Threading": "4.0.11-*",
         "System.Threading.Tasks": "4.0.11-*",
         "System.Threading.Timer": "4.0.1-*"
-      }
+      },
+      "imports": [
+        "dotnet5.4"
+      ]
     }
   }
 }

src/Microsoft.AspNetCore.WebSockets.Server/project.json

@@ -3,7 +3,9 @@
   "compilationOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk",
-    "nowarn": [ "CS1591" ],
+    "nowarn": [
+      "CS1591"
+    ],
     "xmlDoc": true
   },
   "description": "ASP.NET 5 web socket middleware for use on top of opaque servers.",
@@ -18,9 +20,11 @@
   },
   "frameworks": {
     "net451": {},
-    "dotnet5.4": {
+    "netstandard1.3": {
-      "dependencies": {
+      "dependencies": {},
-      }
+      "imports": [
+        "dotnet5.4"
+      ]
     }
   }
 }

test/AutobahnTestServer/project.json

@@ -9,11 +9,14 @@
     "emitEntryPoint": true
   },
   "frameworks": {
-    "dnxcore50": {
+    "netstandardapp1.5": {
       "dependencies": {
         "dotnet-test-xunit": "1.0.0-dev-*"
       },
-      "imports": "portable-net451+win8"
+      "imports": [
+        "dnxcore50",
+        "portable-net451+win8"
+      ]
     },
     "dnx451": {}
   },

test/Microsoft.AspNetCore.WebSockets.Protocol.Test/BufferStream.cs

@@ -138,7 +138,7 @@ namespace Microsoft.AspNetCore.WebSockets.Protocol.Test
             }
         }
 
-#if !DNXCORE50
+#if !NETSTANDARDAPP1_5
         public override IAsyncResult BeginRead(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
         {
             // TODO: This option doesn't preserve the state object.
@@ -226,7 +226,7 @@ namespace Microsoft.AspNetCore.WebSockets.Protocol.Test
             }
         }
 
-#if !DNXCORE50
+#if !NETSTANDARDAPP1_5
         public override IAsyncResult BeginWrite(byte[] buffer, int offset, int count, AsyncCallback callback, object state)
         {
             Write(buffer, offset, count);

test/Microsoft.AspNetCore.WebSockets.Protocol.Test/DuplexStream.cs

@@ -93,7 +93,7 @@ namespace Microsoft.AspNetCore.WebSockets.Protocol.Test
             return _readStream.Read(buffer, offset, count);
         }
 
-#if !DNXCORE50
+#if !NETSTANDARDAPP1_5
         public override int ReadByte()
         {
             return _readStream.ReadByte();
@@ -129,7 +129,7 @@ namespace Microsoft.AspNetCore.WebSockets.Protocol.Test
             _writeStream.Write(buffer, offset, count);
         }
 
-#if !DNXCORE50
+#if !NETSTANDARDAPP1_5
         public override void WriteByte(byte value)
         {
             _writeStream.WriteByte(value);

test/Microsoft.AspNetCore.WebSockets.Protocol.Test/project.json

@@ -6,11 +6,14 @@
   },
   "testRunner": "xunit",
   "frameworks": {
-    "dnxcore50": {
+    "netstandardapp1.5": {
       "dependencies": {
         "dotnet-test-xunit": "1.0.0-dev-*"
       },
-      "imports": "portable-net451+win8"
+      "imports": [
+        "dnxcore50",
+        "portable-net451+win8"
+      ]
     },
     "net451": {
       "frameworkAssemblies": {
@@ -21,5 +24,4 @@
       }
     }
   }
-}
+}
-