Merge branch 'release' into dev

bricelam · bricelam · commit 10ada04343db · 2015-10-01T13:11:24.000-07:00
diff --git a/src/EntityFramework.Core/project.json b/src/EntityFramework.Core/project.json
@@ -64,7 +64,7 @@
         "System.Threading": "4.0.0.0"
       }
     },
-    "dotnet": {
+    "dnxcore50": {
       "dependencies": {
         "System.Collections": "4.0.11-beta-*",
         "System.Collections.Concurrent": "4.0.11-beta-*",
@@ -84,6 +84,27 @@
         "System.Threading": "4.0.11-beta-*",
         "System.Threading.Tasks": "4.0.11-beta-*"
       }
+    },
+    "dotnet": {
+      "dependencies": {
+        "System.ComponentModel": "4.0.0",
+        "System.ComponentModel.Annotations": "4.0.10",
+        "System.Diagnostics.Debug": "4.0.10",
+        "System.Globalization": "4.0.10",
+        "System.IO": "4.0.10",
+        "System.Linq": "4.0.0",
+        "System.Linq.Expressions": "4.0.10",
+        "System.Linq.Queryable": "4.0.0",
+        "System.ObjectModel": "4.0.10",
+        "System.Reflection": "4.0.10",
+        "System.Reflection.Extensions": "4.0.0",
+        "System.Reflection.TypeExtensions": "4.0.0",
+        "System.Resources.ResourceManager": "4.0.0",
+        "System.Runtime": "4.0.20",
+        "System.Runtime.Extensions": "4.0.10",
+        "System.Threading": "4.0.10",
+        "System.Threading.Tasks": "4.0.10"
+      }
     }
   }
 }
diff --git a/src/EntityFramework.Relational/project.json b/src/EntityFramework.Relational/project.json
@@ -23,12 +23,19 @@
         "System.Transactions": "4.0.0.0"
       }
     },
-    "dotnet": {
+    "dnxcore50": {
       "dependencies": {
         "System.Data.Common": "4.0.1-beta-*",
         "System.Text.RegularExpressions": "4.0.11-beta-*",
         "Microsoft.CSharp": "4.0.1-beta-*"
       }
+    },
+    "dotnet": {
+      "dependencies": {
+        "Microsoft.CSharp": "4.0.0",
+        "System.Data.Common": "4.0.0",
+        "System.Dynamic.Runtime": "4.0.10"
+      }
     }
   }
 }
diff --git a/src/EntityFramework.SqlServer/project.json b/src/EntityFramework.SqlServer/project.json
@@ -25,6 +25,12 @@
         "System.Threading.Thread": "4.0.0-*",
         "System.Threading.ThreadPool": "4.0.10-*"
       }
+    },
+    "dotnet": {
+      "dependencies": {
+        "System.Data.SqlClient": "4.0.0-*",
+        "System.Threading.Thread": "4.0.0-*"
+      }
     }
   }
 }
diff --git a/src/EntityFramework.Sqlite/project.json b/src/EntityFramework.Sqlite/project.json
@@ -19,11 +19,16 @@
   "resource": ["Properties/EntityFramework.Sqlite.rd.xml"],
   "frameworks": {
     "net45": { },
-    "dotnet": {
+    "dnxcore50": {
       "dependencies": {
         "System.IO.FileSystem": "4.0.1-beta-*",
         "Microsoft.CSharp": "4.0.1-beta-*"
       }
+    },
+    "dotnet": {
+      "dependencies": {
+        "System.IO.FileSystem": "4.0.0"
+      }
     }
   }
 }
diff --git a/test/EntityFramework.SqlServer.Design.FunctionalTests/project.json b/test/EntityFramework.SqlServer.Design.FunctionalTests/project.json
@@ -5,7 +5,7 @@
 	"EntityFramework.Relational.Design.FunctionalTests": "7.0.0-*",
     "EntityFramework.SqlServer": "7.0.0-*",
     "EntityFramework.SqlServer.Design": "7.0.0-*",
-    "EntityFramework.SqlServer.FunctionalTests": "7.0.0-*"
+    "EntityFramework.SqlServer.FunctionalTests": "1.0.0"
   },
   "commands": {
     "test": "xunit.runner.aspnet"
diff --git a/test/EntityFramework.Sqlite.Design.FunctionalTests/project.json b/test/EntityFramework.Sqlite.Design.FunctionalTests/project.json
@@ -3,7 +3,7 @@
     "EntityFramework.Relational.Design": "7.0.0-*",
     "EntityFramework.Core.FunctionalTests": "7.0.0-*",
     "EntityFramework.Relational.Design.FunctionalTests": "7.0.0-*",
-    "EntityFramework.Sqlite.FunctionalTests": "7.0.0-*",
+    "EntityFramework.Sqlite.FunctionalTests": "1.0.0",
     "EntityFramework.Sqlite.Design": "7.0.0-*"
   },
   "commands": {

Original file line number	Diff line number	Diff line change
`@@ -23,12 +23,19 @@`
`23`	`23`	`"System.Transactions": "4.0.0.0"`
`24`	`24`	`}`
`25`	`25`	`},`
`26`		`- "dotnet": {`
	`26`	`+ "dnxcore50": {`
`27`	`27`	`"dependencies": {`
`28`	`28`	`"System.Data.Common": "4.0.1-beta-*",`
`29`	`29`	`"System.Text.RegularExpressions": "4.0.11-beta-*",`
`30`	`30`	`"Microsoft.CSharp": "4.0.1-beta-*"`
`31`	`31`	`}`
	`32`	`+ },`
	`33`	`+ "dotnet": {`
	`34`	`+ "dependencies": {`
	`35`	`+ "Microsoft.CSharp": "4.0.0",`
	`36`	`+ "System.Data.Common": "4.0.0",`
	`37`	`+ "System.Dynamic.Runtime": "4.0.10"`
	`38`	`+ }`
`32`	`39`	`}`
`33`	`40`	`}`
`34`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,12 @@`
`25`	`25`	`"System.Threading.Thread": "4.0.0-*",`
`26`	`26`	`"System.Threading.ThreadPool": "4.0.10-*"`
`27`	`27`	`}`
	`28`	`+ },`
	`29`	`+ "dotnet": {`
	`30`	`+ "dependencies": {`
	`31`	`+ "System.Data.SqlClient": "4.0.0-*",`
	`32`	`+ "System.Threading.Thread": "4.0.0-*"`
	`33`	`+ }`
`28`	`34`	`}`
`29`	`35`	`}`
`30`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,11 +19,16 @@`
`19`	`19`	`"resource": ["Properties/EntityFramework.Sqlite.rd.xml"],`
`20`	`20`	`"frameworks": {`
`21`	`21`	`"net45": { },`
`22`		`- "dotnet": {`
	`22`	`+ "dnxcore50": {`
`23`	`23`	`"dependencies": {`
`24`	`24`	`"System.IO.FileSystem": "4.0.1-beta-*",`
`25`	`25`	`"Microsoft.CSharp": "4.0.1-beta-*"`
`26`	`26`	`}`
	`27`	`+ },`
	`28`	`+ "dotnet": {`
	`29`	`+ "dependencies": {`
	`30`	`+ "System.IO.FileSystem": "4.0.0"`
	`31`	`+ }`
`27`	`32`	`}`
`28`	`33`	`}`
`29`	`34`	`}`