Transition to netstandard.

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

samples/IISSample/project.json

@@ -13,8 +13,12 @@
     "web": "IISSample"
   },
   "frameworks": {
-    "dnx451": { },
+    "dnx451": {},
-    "dnxcore50": { }
+    "netstandardapp1.5": {
+      "imports": [
+        "dnxcore50"
+      ]
+    }
   },
   "publishExclude": [
     "node_modules",
@@ -28,4 +32,4 @@
     "node_modules",
     "bower_components"
   ]
-}
+}

src/Microsoft.AspNetCore.IISPlatformHandler/NativeMethods.cs

@@ -8,13 +8,13 @@ namespace Microsoft.AspNetCore.IISPlatformHandler
 {
     internal class NativeMethods
     {
-#if DOTNET5_4
+#if NETSTANDARD1_3
         private const string api_ms_win_core_handle_LIB = "api-ms-win-core-handle-l1-1-0.dll";
 #else
         private const string KERNEL32 = "kernel32.dll";
 #endif
 
-#if DOTNET5_4
+#if NETSTANDARD1_3
         [DllImport(api_ms_win_core_handle_LIB, ExactSpelling = true, SetLastError = true)]
 #else
         [DllImport(KERNEL32, ExactSpelling = true, SetLastError = true)]

src/Microsoft.AspNetCore.IISPlatformHandler/project.json

@@ -3,13 +3,15 @@
   "compilationOptions": {
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk",
-    "nowarn": [ "CS1591" ],
+    "nowarn": [
+      "CS1591"
+    ],
     "xmlDoc": true
   },
   "description": "ASP.NET 5 components for working with the IIS HttpPlatformHandler module.",
   "repository": {
-      "type": "git",
+    "type": "git",
-      "url": "git://github.com/aspnet/IISIntegration"
+    "url": "git://github.com/aspnet/IISIntegration"
   },
   "dependencies": {
     "Microsoft.AspNetCore.Hosting.Abstractions": "1.0.0-*",
@@ -23,11 +25,14 @@
     }
   },
   "frameworks": {
-    "net451": { },
+    "net451": {},
-    "dotnet5.4": {
+    "netstandard1.3": {
       "dependencies": {
         "System.Security.Principal.Windows": "4.0.0-*"
-      }
+      },
+      "imports": [
+        "dotnet5.4"
+      ]
     }
   }
-}
+}

src/dotnet-publish-iis/project.json

@@ -1,14 +1,15 @@
-{
+{
   "name": "dotnet-publish-iis",
   "version": "1.0.0-*",
   "compilationOptions": {
     "emitEntryPoint": true,
     "warningsAsErrors": true,
     "keyFile": "../../tools/Key.snk",
-    "nowarn": [ "CS1591" ],
+    "nowarn": [
+      "CS1591"
+    ],
     "xmlDoc": true
   },
-
   "dependencies": {
     "NETStandard.Library": "1.0.0-*",
     "Microsoft.Extensions.CommandLineUtils": "1.0.0-*",
@@ -16,9 +17,11 @@
     "Microsoft.DotNet.ProjectModel": "1.0.0-*",
     "Microsoft.DotNet.Cli.Utils": "1.0.0-*"
   },
-
   "frameworks": {
-    "dnxcore50": {
+    "netstandardapp1.5": {
+      "imports": [
+        "dnxcore50"
+      ]
     }
   }
-}
+}

test/Microsoft.AspNetCore.IISPlatformHandler.Tests/project.json

@@ -7,8 +7,11 @@
     "xunit": "2.1.0"
   },
   "frameworks": {
-    "dnxcore50": {
+    "netstandardapp1.5": {
-      "imports": "portable-net451+win8",
+      "imports": [
+        "dnxcore50",
+        "portable-net451+win8"
+      ],
       "dependencies": {
         "dotnet-test-xunit": "1.0.0-dev-*"
       }
@@ -19,5 +22,5 @@
       }
     }
   },
-    "testRunner": "xunit"
+  "testRunner": "xunit"
 }

test/TestSites/project.json

@@ -17,8 +17,11 @@
     "xunit": "2.1.0"
   },
   "frameworks": {
-    "dnxcore50": {
+    "netstandardapp1.5": {
-      "imports": "portable-net451+win8",
+      "imports": [
+        "dnxcore50",
+        "portable-net451+win8"
+      ],
       "dependencies": {
         "System.Net.Primitives": "4.0.11-*",
         "dotnet-test-xunit": "1.0.0-dev-*"
@@ -26,4 +29,4 @@
     },
     "dnx451": {}
   }
-}
+}

test/dotnet-publish-iis.Tests/project.json

@@ -5,11 +5,14 @@
     "Microsoft.NETCore.Platforms": "1.0.1-*"
   },
   "frameworks": {
-    "dnxcore50": {
+    "netstandardapp1.5": {
-      "imports": "portable-net451+win8",
+      "imports": [
+        "dnxcore50",
+        "portable-net451+win8"
+      ],
       "dependencies": {
         "dotnet-test-xunit": "1.0.0-dev-*"
       }
     }
   }
-}
+}