Merge branch 'release' into dev

src/Microsoft.AspNetCore.Cryptography.Internal/project.json

@@ -20,10 +20,7 @@
         "System.Runtime.InteropServices": "4.1.0-*",
         "System.Security.Cryptography.Primitives": "4.0.0-*",
         "System.Threading": "4.0.11-*"
-      },
+      }
-      "imports": [
-        "dotnet5.4"
-      ]
     }
   },
   "compilationOptions": {

src/Microsoft.AspNetCore.Cryptography.KeyDerivation/project.json

@@ -19,10 +19,7 @@
         "System.Runtime.Extensions": "4.1.0-*",
         "System.Security.Cryptography.Algorithms": "4.1.0-*",
         "System.Text.Encoding.Extensions": "4.0.11-*"
-      },
+      }
-      "imports": [
-        "dotnet5.4"
-      ]
     }
   },
   "compilationOptions": {

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

@@ -22,10 +22,7 @@
       "dependencies": {
         "System.ComponentModel": "4.0.1-*",
         "System.Diagnostics.Debug": "4.0.11-*"
-      },
+      }
-      "imports": [
-        "dotnet5.4"
-      ]
     }
   },
   "compilationOptions": {

src/Microsoft.AspNetCore.DataProtection.Extensions/project.json

@@ -19,11 +19,7 @@
   },
   "frameworks": {
     "net451": {},
-    "netstandard1.3": {
+    "netstandard1.3": {}
-      "imports": [
-        "dotnet5.4"
-      ]
-    }
   },
   "compilationOptions": {
     "warningsAsErrors": true,

src/Microsoft.AspNetCore.DataProtection.Sources/project.json

@@ -16,10 +16,7 @@
       "dependencies": {
         "System.Security.Cryptography.Primitives": "4.0.0-*",
         "System.Text.Encoding.Extensions": "4.0.11-*"
-      },
+      }
-      "imports": [
-        "dotnet5.4"
-      ]
     }
   },
   "shared": "**\\*.cs",

src/Microsoft.AspNetCore.DataProtection/project.json

@@ -23,7 +23,9 @@
   "frameworks": {
     "net451": {
       "frameworkAssemblies": {
-        "System.Runtime": { "type": "build" },
+        "System.Runtime": {
+          "type": "build"
+        },
         "System.Security": "",
         "System.Xml": "",
         "System.Xml.Linq": ""
@@ -36,10 +38,7 @@
         "System.Security.Claims": "4.0.1-*",
         "System.Security.Principal.Windows": "4.0.0-*",
         "System.Xml.XDocument": "4.0.11-*"
-      },
+      }
-      "imports": [
-        "dotnet5.4"
-      ]
     }
   },
   "compilationOptions": {