Skip to content

Commit 10ada04

Browse files
committed
Merge branch 'release' into dev
2 parents 8b50592 + 9d65f03 commit 10ada04

File tree

6 files changed

+44
-5
lines changed

6 files changed

+44
-5
lines changed

src/EntityFramework.Core/project.json

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
"System.Threading": "4.0.0.0"
6565
}
6666
},
67-
"dotnet": {
67+
"dnxcore50": {
6868
"dependencies": {
6969
"System.Collections": "4.0.11-beta-*",
7070
"System.Collections.Concurrent": "4.0.11-beta-*",
@@ -84,6 +84,27 @@
8484
"System.Threading": "4.0.11-beta-*",
8585
"System.Threading.Tasks": "4.0.11-beta-*"
8686
}
87+
},
88+
"dotnet": {
89+
"dependencies": {
90+
"System.ComponentModel": "4.0.0",
91+
"System.ComponentModel.Annotations": "4.0.10",
92+
"System.Diagnostics.Debug": "4.0.10",
93+
"System.Globalization": "4.0.10",
94+
"System.IO": "4.0.10",
95+
"System.Linq": "4.0.0",
96+
"System.Linq.Expressions": "4.0.10",
97+
"System.Linq.Queryable": "4.0.0",
98+
"System.ObjectModel": "4.0.10",
99+
"System.Reflection": "4.0.10",
100+
"System.Reflection.Extensions": "4.0.0",
101+
"System.Reflection.TypeExtensions": "4.0.0",
102+
"System.Resources.ResourceManager": "4.0.0",
103+
"System.Runtime": "4.0.20",
104+
"System.Runtime.Extensions": "4.0.10",
105+
"System.Threading": "4.0.10",
106+
"System.Threading.Tasks": "4.0.10"
107+
}
87108
}
88109
}
89110
}

src/EntityFramework.Relational/project.json

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,19 @@
2323
"System.Transactions": "4.0.0.0"
2424
}
2525
},
26-
"dotnet": {
26+
"dnxcore50": {
2727
"dependencies": {
2828
"System.Data.Common": "4.0.1-beta-*",
2929
"System.Text.RegularExpressions": "4.0.11-beta-*",
3030
"Microsoft.CSharp": "4.0.1-beta-*"
3131
}
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+
}
3239
}
3340
}
3441
}

src/EntityFramework.SqlServer/project.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,12 @@
2525
"System.Threading.Thread": "4.0.0-*",
2626
"System.Threading.ThreadPool": "4.0.10-*"
2727
}
28+
},
29+
"dotnet": {
30+
"dependencies": {
31+
"System.Data.SqlClient": "4.0.0-*",
32+
"System.Threading.Thread": "4.0.0-*"
33+
}
2834
}
2935
}
3036
}

src/EntityFramework.Sqlite/project.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,16 @@
1919
"resource": ["Properties/EntityFramework.Sqlite.rd.xml"],
2020
"frameworks": {
2121
"net45": { },
22-
"dotnet": {
22+
"dnxcore50": {
2323
"dependencies": {
2424
"System.IO.FileSystem": "4.0.1-beta-*",
2525
"Microsoft.CSharp": "4.0.1-beta-*"
2626
}
27+
},
28+
"dotnet": {
29+
"dependencies": {
30+
"System.IO.FileSystem": "4.0.0"
31+
}
2732
}
2833
}
2934
}

test/EntityFramework.SqlServer.Design.FunctionalTests/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"EntityFramework.Relational.Design.FunctionalTests": "7.0.0-*",
66
"EntityFramework.SqlServer": "7.0.0-*",
77
"EntityFramework.SqlServer.Design": "7.0.0-*",
8-
"EntityFramework.SqlServer.FunctionalTests": "7.0.0-*"
8+
"EntityFramework.SqlServer.FunctionalTests": "1.0.0"
99
},
1010
"commands": {
1111
"test": "xunit.runner.aspnet"

test/EntityFramework.Sqlite.Design.FunctionalTests/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"EntityFramework.Relational.Design": "7.0.0-*",
44
"EntityFramework.Core.FunctionalTests": "7.0.0-*",
55
"EntityFramework.Relational.Design.FunctionalTests": "7.0.0-*",
6-
"EntityFramework.Sqlite.FunctionalTests": "7.0.0-*",
6+
"EntityFramework.Sqlite.FunctionalTests": "1.0.0",
77
"EntityFramework.Sqlite.Design": "7.0.0-*"
88
},
99
"commands": {

0 commit comments

Comments
 (0)