Merge branch 'release' into dev

src/Microsoft.AspNetCore.Mvc.Abstractions/project.json

@@ -41,10 +41,7 @@
         "System.ComponentModel.TypeConverter": "4.0.1-*",
         "System.Reflection.Extensions": "4.0.1-*",
         "System.Text.Encoding.Extensions": "4.0.11-*"
-      },
-      "imports": [
-        "dotnet5.4"
-      ]
+      }
     }
   }
 }

src/Microsoft.AspNetCore.Mvc.ApiExplorer/project.json

@@ -28,7 +28,6 @@
     "net451": {},
     "netstandard1.5": {
       "imports": [
-        "dotnet5.6",
         "portable-net451+win8"
       ]
     }

src/Microsoft.AspNetCore.Mvc.Core/project.json

@@ -50,10 +50,9 @@
     "System.Diagnostics.DiagnosticSource": "4.0.0-*"
   },
   "frameworks": {
-    "net451": { },
+    "net451": {},
     "netstandard1.5": {
       "imports": [
-        "dotnet5.6",
         "portable-net451+win8"
       ],
       "dependencies": {

src/Microsoft.AspNetCore.Mvc.Cors/project.json

@@ -21,7 +21,6 @@
     "net451": {},
     "netstandard1.5": {
       "imports": [
-        "dotnet5.6",
         "portable-net451+win8"
       ]
     }

src/Microsoft.AspNetCore.Mvc.DataAnnotations/project.json

@@ -33,7 +33,6 @@
     },
     "netstandard1.5": {
       "imports": [
-        "dotnet5.6",
         "portable-net451+win8"
       ],
       "dependencies": {

src/Microsoft.AspNetCore.Mvc.Formatters.Json/project.json

@@ -25,7 +25,6 @@
     "net451": {},
     "netstandard1.5": {
       "imports": [
-        "dotnet5.6",
         "portable-net451+win8"
       ]
     }

src/Microsoft.AspNetCore.Mvc.Formatters.Xml/project.json

@@ -33,7 +33,6 @@
     },
     "netstandard1.5": {
       "imports": [
-        "dotnet5.6",
         "portable-net451+win8"
       ],
       "dependencies": {
@@ -42,4 +41,4 @@
       }
     }
   }
-}
+}

src/Microsoft.AspNetCore.Mvc.Localization/project.json

@@ -23,7 +23,6 @@
     "net451": {},
     "netstandard1.5": {
       "imports": [
-        "dotnet5.6",
         "portable-net45+win8"
       ]
     }

src/Microsoft.AspNetCore.Mvc.Razor.Host/project.json

@@ -23,17 +23,14 @@
     }
   },
   "frameworks": {
-    "net451": { },
+    "net451": {},
     "netstandard1.5": {
       "dependencies": {
         "System.Collections.Concurrent": "4.0.12-*",
         "System.ComponentModel.TypeConverter": "4.0.1-*",
         "System.Reflection.Extensions": "4.0.1-*",
         "System.Text.Encoding.Extensions": "4.0.11-*"
-      },
-      "imports": [
-        "dotnet5.6"
-      ]
+      }
     }
   },
   "exclude": [

src/Microsoft.AspNetCore.Mvc.Razor/project.json

@@ -34,12 +34,13 @@
   "frameworks": {
     "net451": {
       "frameworkAssemblies": {
-        "System.Threading.Tasks": { "type": "build" }
+        "System.Threading.Tasks": {
+          "type": "build"
+        }
       }
     },
     "netstandard1.5": {
       "imports": [
-        "dotnet5.6",
         "portable-net451+win8"
       ],
       "dependencies": {

src/Microsoft.AspNetCore.Mvc.TagHelpers/project.json

@@ -35,7 +35,6 @@
     "net451": {},
     "netstandard1.5": {
       "imports": [
-        "dotnet5.6",
         "portable-net45+win8"
       ]
     }

src/Microsoft.AspNetCore.Mvc.ViewFeatures/project.json

@@ -48,7 +48,6 @@
     "net451": {},
     "netstandard1.5": {
       "imports": [
-        "dotnet5.6",
         "portable-net451+win8"
       ]
     }

src/Microsoft.AspNetCore.Mvc.WebApiCompatShim/project.json

@@ -33,7 +33,6 @@
     },
     "netstandard1.5": {
       "imports": [
-        "dotnet5.6",
         "portable-net451+win8"
       ],
       "dependencies": {

src/Microsoft.AspNetCore.Mvc/project.json

@@ -33,7 +33,6 @@
     "net451": {},
     "netstandard1.5": {
       "imports": [
-        "dotnet5.6",
         "portable-net451+win8"
       ]
     }