Merge branch 'release' into dev
This commit is contained in:
commit
811b59fe94
|
|
@ -29,8 +29,8 @@
|
|||
"Microsoft.AspNet.Mvc": "6.0.0-*",
|
||||
"Microsoft.AspNet.Server.WebListener": "1.0.0-*",
|
||||
"Microsoft.AspNet.StaticFiles": "1.0.0-*",
|
||||
"EntityFramework7.InMemory": "7.0.0-*",
|
||||
"EntityFramework7.SqlServer": "7.0.0-*",
|
||||
"EntityFramework.InMemory": "7.0.0-*",
|
||||
"EntityFramework.SqlServer": "7.0.0-*",
|
||||
"Microsoft.AspNet.Authentication.Cookies": "1.0.0-*",
|
||||
"Microsoft.AspNet.Identity.EntityFramework": "3.0.0-*",
|
||||
"Microsoft.Framework.Configuration": "1.0.0-*",
|
||||
|
|
|
|||
|
|
@ -11,8 +11,8 @@
|
|||
"publishExclude": "*.cmd",
|
||||
"webroot": "wwwroot",
|
||||
"dependencies": {
|
||||
"EntityFramework7.InMemory": "7.0.0-*",
|
||||
"EntityFramework7.SqlServer": "7.0.0-*",
|
||||
"EntityFramework.InMemory": "7.0.0-*",
|
||||
"EntityFramework.SqlServer": "7.0.0-*",
|
||||
"Kestrel": "1.0.0-*",
|
||||
"Microsoft.AspNet.Antiforgery": "1.0.0-*",
|
||||
"Microsoft.AspNet.Authentication.Cookies": "1.0.0-*",
|
||||
|
|
|
|||
Loading…
Reference in New Issue