Merge branch 'release' into dev

pranavkm · pranavkm · commit fd0505ffaea9 · 2016-04-08T06:48:41.000-07:00
diff --git a/src/Microsoft.AspNetCore.Http.Abstractions/project.json b/src/Microsoft.AspNetCore.Http.Abstractions/project.json
@@ -27,7 +27,9 @@
   "frameworks": {
     "net451": {
       "frameworkAssemblies": {
-        "System.Runtime": { "type": "build" }
+        "System.Runtime": {
+          "type": "build"
+        }
       }
     },
     "netstandard1.3": {
@@ -36,10 +38,7 @@
         "System.Linq.Expressions": "4.0.11-*",
         "System.Reflection.TypeExtensions": "4.1.0-*",
         "System.Runtime.InteropServices": "4.1.0-*"
-      },
-      "imports": [
-        "dotnet5.4"
-      ]
+      }
     }
   }
 }
diff --git a/src/Microsoft.AspNetCore.Http.Extensions/project.json b/src/Microsoft.AspNetCore.Http.Extensions/project.json
@@ -23,14 +23,11 @@
     "System.Buffers": "4.0.0-*"
   },
   "frameworks": {
-    "net451": { },
+    "net451": {},
     "netstandard1.3": {
       "dependencies": {
         "System.IO.FileSystem": "4.0.1-*"
-      },
-      "imports": [
-        "dotnet5.4"
-      ]
+      }
     }
   }
 }
diff --git a/src/Microsoft.AspNetCore.Http.Features/project.json b/src/Microsoft.AspNetCore.Http.Features/project.json
@@ -20,7 +20,7 @@
     "Microsoft.Extensions.Primitives": "1.0.0-*"
   },
   "frameworks": {
-    "net451": { },
+    "net451": {},
     "netstandard1.3": {
       "dependencies": {
         "System.Collections": "4.0.11-*",
@@ -32,10 +32,7 @@
         "System.Security.Claims": "4.0.1-*",
         "System.Security.Cryptography.X509Certificates": "4.1.0-*",
         "System.Security.Principal": "4.0.1-*"
-      },
-      "imports": [
-        "dotnet5.4"
-      ]
+      }
     }
   }
 }
diff --git a/src/Microsoft.AspNetCore.Http/project.json b/src/Microsoft.AspNetCore.Http/project.json
@@ -25,14 +25,11 @@
     "System.Buffers": "4.0.0-*"
   },
   "frameworks": {
-    "net451": { },
+    "net451": {},
     "netstandard1.3": {
       "dependencies": {
         "System.Threading": "4.0.11-*"
-      },
-      "imports": [
-        "dotnet5.4"
-      ]
+      }
     }
   }
 }
diff --git a/src/Microsoft.AspNetCore.Owin/project.json b/src/Microsoft.AspNetCore.Owin/project.json
@@ -22,11 +22,7 @@
     "Microsoft.AspNetCore.Http": "1.0.0-*"
   },
   "frameworks": {
-    "net451": { },
-    "netstandard1.3": {
-      "imports": [
-        "dotnet5.4"
-      ]
-    }
+    "net451": {},
+    "netstandard1.3": {}
   }
 }
diff --git a/src/Microsoft.AspNetCore.WebUtilities/project.json b/src/Microsoft.AspNetCore.WebUtilities/project.json
@@ -24,18 +24,17 @@
   "frameworks": {
     "net451": {
       "frameworkAssemblies": {
-        "System.Runtime": { "type": "build" }
+        "System.Runtime": {
+          "type": "build"
+        }
       }
     },
     "netstandard1.3": {
       "dependencies": {
         "System.Collections": "4.0.11-*",
         "System.IO": "4.1.0-*",
         "System.IO.FileSystem": "4.0.1-*"
-      },
-      "imports": [
-        "dotnet5.4"
-      ]
+      }
     }
   }
 }
diff --git a/src/Microsoft.Net.Http.Headers/project.json b/src/Microsoft.Net.Http.Headers/project.json
@@ -16,7 +16,7 @@
     ],
     "xmlDoc": true
   },
-  "dependencies": { },
+  "dependencies": {},
   "frameworks": {
     "netstandard1.1": {
       "dependencies": {
@@ -28,10 +28,7 @@
         "System.Runtime.Extensions": "4.1.0-*",
         "System.Text.Encoding": "4.0.11-*",
         "System.Buffers": "4.0.0-*"
-      },
-      "imports": [
-        "dotnet5.2"
-      ]
+      }
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,9 @@`
`27`	`27`	`"frameworks": {`
`28`	`28`	`"net451": {`
`29`	`29`	`"frameworkAssemblies": {`
`30`		`- "System.Runtime": { "type": "build" }`
	`30`	`+ "System.Runtime": {`
	`31`	`+ "type": "build"`
	`32`	`+ }`
`31`	`33`	`}`
`32`	`34`	`},`
`33`	`35`	`"netstandard1.3": {`
`@@ -36,10 +38,7 @@`
`36`	`38`	`"System.Linq.Expressions": "4.0.11-*",`
`37`	`39`	`"System.Reflection.TypeExtensions": "4.1.0-*",`
`38`	`40`	`"System.Runtime.InteropServices": "4.1.0-*"`
`39`		`- },`
`40`		`- "imports": [`
`41`		`- "dotnet5.4"`
`42`		`- ]`
	`41`	`+ }`
`43`	`42`	`}`
`44`	`43`	`}`
`45`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,14 +23,11 @@`
`23`	`23`	`"System.Buffers": "4.0.0-*"`
`24`	`24`	`},`
`25`	`25`	`"frameworks": {`
`26`		`- "net451": { },`
	`26`	`+ "net451": {},`
`27`	`27`	`"netstandard1.3": {`
`28`	`28`	`"dependencies": {`
`29`	`29`	`"System.IO.FileSystem": "4.0.1-*"`
`30`		`- },`
`31`		`- "imports": [`
`32`		`- "dotnet5.4"`
`33`		`- ]`
	`30`	`+ }`
`34`	`31`	`}`
`35`	`32`	`}`
`36`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,14 +25,11 @@`
`25`	`25`	`"System.Buffers": "4.0.0-*"`
`26`	`26`	`},`
`27`	`27`	`"frameworks": {`
`28`		`- "net451": { },`
	`28`	`+ "net451": {},`
`29`	`29`	`"netstandard1.3": {`
`30`	`30`	`"dependencies": {`
`31`	`31`	`"System.Threading": "4.0.11-*"`
`32`		`- },`
`33`		`- "imports": [`
`34`		`- "dotnet5.4"`
`35`		`- ]`
	`32`	`+ }`
`36`	`33`	`}`
`37`	`34`	`}`
`38`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,11 +22,7 @@`
`22`	`22`	`"Microsoft.AspNetCore.Http": "1.0.0-*"`
`23`	`23`	`},`
`24`	`24`	`"frameworks": {`
`25`		`- "net451": { },`
`26`		`- "netstandard1.3": {`
`27`		`- "imports": [`
`28`		`- "dotnet5.4"`
`29`		`- ]`
`30`		`- }`
	`25`	`+ "net451": {},`
	`26`	`+ "netstandard1.3": {}`
`31`	`27`	`}`
`32`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,18 +24,17 @@`
`24`	`24`	`"frameworks": {`
`25`	`25`	`"net451": {`
`26`	`26`	`"frameworkAssemblies": {`
`27`		`- "System.Runtime": { "type": "build" }`
	`27`	`+ "System.Runtime": {`
	`28`	`+ "type": "build"`
	`29`	`+ }`
`28`	`30`	`}`
`29`	`31`	`},`
`30`	`32`	`"netstandard1.3": {`
`31`	`33`	`"dependencies": {`
`32`	`34`	`"System.Collections": "4.0.11-*",`
`33`	`35`	`"System.IO": "4.1.0-*",`
`34`	`36`	`"System.IO.FileSystem": "4.0.1-*"`
`35`		`- },`
`36`		`- "imports": [`
`37`		`- "dotnet5.4"`
`38`		`- ]`
	`37`	`+ }`
`39`	`38`	`}`
`40`	`39`	`}`
`41`	`40`	`}`