Merge branch 'release' into dev

Author: pakrym

test/Microsoft.AspNetCore.Http.Abstractions.Tests/project.json

@@ -9,10 +9,13 @@
     "xunit": "2.1.0"
   },
   "frameworks": {
-    "netstandardapp1.5": {
+    "netcoreapp1.0": {
       "dependencies": {
+        "Microsoft.NETCore.App": {
+          "version": "1.0.0-*",
+          "type": "platform"
+        },
         "dotnet-test-xunit": "1.0.0-dev-*",
-        "NETStandard.Library": "1.5.0-*",
         "System.Diagnostics.Process": "4.1.0-*"
       },
       "imports": [

test/Microsoft.AspNetCore.Http.Extensions.Tests/project.json

@@ -6,10 +6,13 @@
     "xunit": "2.1.0"
   },
   "frameworks": {
-    "netstandardapp1.5": {
+    "netcoreapp1.0": {
       "dependencies": {
+        "Microsoft.NETCore.App": {
+          "version": "1.0.0-*",
+          "type": "platform"
+        },
         "dotnet-test-xunit": "1.0.0-dev-*",
-        "NETStandard.Library": "1.5.0-*",
         "System.Diagnostics.Process": "4.1.0-*"
       },
       "imports": [

test/Microsoft.AspNetCore.Http.Features.Tests/project.json

@@ -4,10 +4,13 @@
     "xunit": "2.1.0"
   },
   "frameworks": {
-    "netstandardapp1.5": {
+    "netcoreapp1.0": {
       "dependencies": {
+        "Microsoft.NETCore.App": {
+          "version": "1.0.0-*",
+          "type": "platform"
+        },
         "dotnet-test-xunit": "1.0.0-dev-*",
-        "NETStandard.Library": "1.5.0-*",
         "System.Diagnostics.Process": "4.1.0-*"
       },
       "imports": [

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

@@ -4,10 +4,13 @@
     "xunit": "2.1.0"
   },
   "frameworks": {
-    "netstandardapp1.5": {
+    "netcoreapp1.0": {
       "dependencies": {
+        "Microsoft.NETCore.App": {
+          "version": "1.0.0-*",
+          "type": "platform"
+        },
         "dotnet-test-xunit": "1.0.0-dev-*",
-        "NETStandard.Library": "1.5.0-*",
         "System.Diagnostics.Process": "4.1.0-*"
       },
       "imports": [

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

@@ -6,10 +6,13 @@
     "xunit": "2.1.0"
   },
   "frameworks": {
-    "netstandardapp1.5": {
+    "netcoreapp1.0": {
       "dependencies": {
+        "Microsoft.NETCore.App": {
+          "version": "1.0.0-*",
+          "type": "platform"
+        },
         "dotnet-test-xunit": "1.0.0-dev-*",
-        "NETStandard.Library": "1.5.0-*",
         "System.Diagnostics.Process": "4.1.0-*"
       },
       "imports": [

test/Microsoft.AspNetCore.WebUtilities.Tests/HttpResponseStreamWriterTest.cs

@@ -335,7 +335,7 @@ public async Task WriteCharArrayAsync_WritesToStream(int byteLength)
 
         [Theory]
         [InlineData("你好世界", "utf-16")]
-#if !NETSTANDARDAPP1_5
+#if !NETCOREAPP1_0
         // CoreCLR does not like shift_jis as an encoding.
         [InlineData("こんにちは世界", "shift_jis")]
 #endif
@@ -366,7 +366,7 @@ public async Task WritesData_InExpectedEncoding(string data, string encodingName
         [InlineData('你', 1023, "utf-16")]
         [InlineData('你', 1024, "utf-16")]
         [InlineData('你', 1050, "utf-16")]
-#if !NETSTANDARDAPP1_5
+#if !NETCOREAPP1_0
         // CoreCLR does not like shift_jis as an encoding.
         [InlineData('こ', 1023, "shift_jis")]
         [InlineData('こ', 1024, "shift_jis")]

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

@@ -8,11 +8,14 @@
   },
   "testRunner": "xunit",
   "frameworks": {
-    "netstandardapp1.5": {
+    "netcoreapp1.0": {
       "dependencies": {
+        "Microsoft.NETCore.App": {
+          "version": "1.0.0-*",
+          "type": "platform"
+        },
         "System.Text.Encoding.Extensions": "4.0.11-*",
         "dotnet-test-xunit": "1.0.0-dev-*",
-        "NETStandard.Library": "1.5.0-*",
         "System.Diagnostics.Process": "4.1.0-*"
       },
       "imports": [

test/Microsoft.Net.Http.Headers.Tests/project.json

@@ -5,10 +5,13 @@
     "xunit": "2.1.0"
   },
   "frameworks": {
-    "netstandardapp1.5": {
+    "netcoreapp1.0": {
       "dependencies": {
+        "Microsoft.NETCore.App": {
+          "version": "1.0.0-*",
+          "type": "platform"
+        },
         "dotnet-test-xunit": "1.0.0-dev-*",
-        "NETStandard.Library": "1.5.0-*",
         "System.Diagnostics.Process": "4.1.0-*"
       },
       "imports": [