Merge branch 'release' into dev

src/Microsoft.Extensions.Configuration.Abstractions/project.json

@@ -23,10 +23,7 @@
     "netstandard1.0": {
       "dependencies": {
         "System.Linq": "4.1.0-*"
-      },
+      }
-      "imports": [
-        "dotnet5.1"
-      ]
     }
   }
 }

src/Microsoft.Extensions.Configuration.Binder/project.json

@@ -23,10 +23,7 @@
     "netstandard1.1": {
       "dependencies": {
         "System.ComponentModel.TypeConverter": "4.0.1-*"
-      },
+      }
-      "imports": [
-        "dotnet5.2"
-      ]
     }
   }
 }

src/Microsoft.Extensions.Configuration.CommandLine/project.json

@@ -21,10 +21,6 @@
     "Microsoft.Extensions.Configuration": "1.0.0-*"
   },
   "frameworks": {
-    "netstandard1.1": {
+    "netstandard1.1": {}
-      "imports": [
-        "dotnet5.2"
-      ]
-    }
   }
 }

src/Microsoft.Extensions.Configuration.EnvironmentVariables/project.json

@@ -24,13 +24,11 @@
   "frameworks": {
     "net451": {
       "frameworkAssemblies": {
-        "System.Runtime": { "type": "build" }
+        "System.Runtime": {
+          "type": "build"
+        }
       }
     },
-    "netstandard1.3": {
+    "netstandard1.3": {}
-      "imports": [
-        "dotnet5.4"
-      ]
-    }
   }
 }

src/Microsoft.Extensions.Configuration.FileExtensions/project.json

@@ -23,16 +23,15 @@
   "frameworks": {
     "net451": {
       "frameworkAssemblies": {
-        "System.Collections": { "type": "build" }
+        "System.Collections": {
+          "type": "build"
+        }
       }
     },
     "netstandard1.3": {
       "dependencies": {
         "System.AppContext": "4.1.0-*"
-      },
+      }
-      "imports": [
-        "dotnet5.4"
-      ]
     }
   }
 }

src/Microsoft.Extensions.Configuration.Ini/project.json

@@ -24,16 +24,15 @@
   "frameworks": {
     "net451": {
       "frameworkAssemblies": {
-        "System.Runtime": { "type": "build" }
+        "System.Runtime": {
+          "type": "build"
+        }
       }
     },
     "netstandard1.3": {
       "dependencies": {
         "System.IO.FileSystem": "4.0.1-*"
-      },
+      }
-      "imports": [
-        "dotnet5.4"
-      ]
     }
   }
 }

src/Microsoft.Extensions.Configuration.Json/project.json

@@ -25,7 +25,9 @@
   "frameworks": {
     "net451": {
       "frameworkAssemblies": {
-        "System.Runtime": { "type": "build" }
+        "System.Runtime": {
+          "type": "build"
+        }
       }
     },
     "netstandard1.3": {
@@ -34,7 +36,6 @@
         "System.IO.FileSystem": "4.0.1-*"
       },
       "imports": [
-        "dotnet5.4",
         "portable-net451+win8"
       ]
     }

src/Microsoft.Extensions.Configuration.Xml/project.json

@@ -24,9 +24,15 @@
   "frameworks": {
     "net451": {
       "frameworkAssemblies": {
-        "System.Runtime": { "type": "build" },
+        "System.Runtime": {
-        "System.Security": { "type": "build" },
+          "type": "build"
-        "System.Xml": { "type": "build" }
+        },
+        "System.Security": {
+          "type": "build"
+        },
+        "System.Xml": {
+          "type": "build"
+        }
       }
     },
     "netstandard1.3": {
@@ -34,10 +40,7 @@
         "System.IO.FileSystem": "4.0.1-*",
         "System.Xml.XmlDocument": "4.0.1-*",
         "System.Xml.XmlSerializer": "4.0.11-*"
-      },
+      }
-      "imports": [
-        "dotnet5.4"
-      ]
     }
   }
 }

src/Microsoft.Extensions.Configuration/project.json

@@ -29,10 +29,7 @@
         "System.Runtime.Extensions": "4.1.0-*",
         "System.Runtime.InteropServices": "4.1.0-*",
         "System.Threading": "4.0.11-*"
-      },
+      }
-      "imports": [
-        "dotnet5.2"
-      ]
     }
   }
 }