Skip to content

Commit

Permalink
Update .NET Core to v1.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
koistya committed Dec 8, 2016
1 parent a247de3 commit b46715e
Show file tree
Hide file tree
Showing 4 changed files with 6,110 additions and 29 deletions.
2 changes: 1 addition & 1 deletion global.json
Expand Up @@ -4,6 +4,6 @@
"server.test"
],
"sdk": {
"version": "1.0.0-preview2-003121"
"version": "1.0.0-preview2-1-003177"
}
}
14 changes: 10 additions & 4 deletions server.test/project.json
Expand Up @@ -6,13 +6,19 @@
},

"dependencies": {
"dotnet-test-xunit": "1.0.0-rc2-*",
"Microsoft.NETCore.App": { "version": "1.0.0", "type": "platform" },
"xunit": "2.2.0-beta1-*"
"dotnet-test-xunit": "2.2.0-preview2-*",
"Microsoft.NETCore.App": { "version": "1.1.0", "type": "platform" },
"xunit": "2.2.0-beta4-*"
},

"frameworks": {
"netcoreapp1.0": {
"netcoreapp1.1": {
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.1.0"
}
},
"imports": [
"dotnet5.6",
"dnxcore50",
Expand Down
54 changes: 30 additions & 24 deletions server/project.json
Expand Up @@ -2,35 +2,41 @@
"version": "1.0.0-*",

"buildOptions": {
"debugType": "portable",
"emitEntryPoint": true,
"preserveCompilationContext": true,
"debugType": "portable"
"preserveCompilationContext": true
},

"dependencies": {
"Microsoft.AspNetCore.Antiforgery": "1.0.0",
"Microsoft.AspNetCore.Authentication.Facebook": "1.0.0",
"Microsoft.AspNetCore.Authorization": "1.0.0",
"Microsoft.AspNetCore.Diagnostics": "1.0.0",
"Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "1.0.0",
"Microsoft.AspNetCore.Hosting": "1.0.0",
"Microsoft.AspNetCore.Identity": "1.0.0",
"Microsoft.AspNetCore.Identity.EntityFrameworkCore": "1.0.0",
"Microsoft.AspNetCore.Mvc": "1.0.0",
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0",
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0",
"Microsoft.AspNetCore.StaticFiles": "1.0.0",
"Microsoft.EntityFrameworkCore.SqlServer": "1.0.0",
"Microsoft.EntityFrameworkCore.Tools": { "version": "1.0.0-preview2-final", "type": "build" },
"Microsoft.Extensions.Configuration.Json": "1.0.0",
"Microsoft.Extensions.Logging.Console": "1.0.0",
"Microsoft.Extensions.Logging.Debug": "1.0.0",
"Microsoft.NETCore.App": { "version": "1.0.0", "type": "platform" },
"Newtonsoft.Json": "9.0.1"
"Microsoft.AspNetCore.Antiforgery": "1.1.0",
"Microsoft.AspNetCore.Authentication.Facebook": "1.1.0",
"Microsoft.AspNetCore.Authorization": "1.1.0",
"Microsoft.AspNetCore.Diagnostics": "1.1.0",
"Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "1.1.0",
"Microsoft.AspNetCore.Hosting": "1.1.0",
"Microsoft.AspNetCore.Identity": "1.1.0",
"Microsoft.AspNetCore.Identity.EntityFrameworkCore": "1.1.0",
"Microsoft.AspNetCore.Mvc": "1.1.0",
"Microsoft.AspNetCore.Server.IISIntegration": "1.1.0",
"Microsoft.AspNetCore.Server.Kestrel": "1.1.0",
"Microsoft.AspNetCore.StaticFiles": "1.1.0",
"Microsoft.EntityFrameworkCore.SqlServer": "1.1.0",
"Microsoft.EntityFrameworkCore.Tools": { "version": "1.1.0-preview4-final", "type": "build" },
"Microsoft.Extensions.Configuration.Json": "1.1.0",
"Microsoft.Extensions.Logging.Console": "1.1.0",
"Microsoft.Extensions.Logging.Debug": "1.1.0",
"Microsoft.NETCore.App": { "version": "1.1.0", "type": "platform" },
"Newtonsoft.Json": "9.0.2-beta1"
},

"frameworks": {
"netcoreapp1.0": {
"netcoreapp1.1": {
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
"version": "1.1.0"
}
},
"imports": [
"dnxcore50",
"portable-net45+win8"
Expand All @@ -44,11 +50,11 @@

"tools": {
"Microsoft.EntityFrameworkCore.Tools": {
"version": "1.0.0-preview2-final",
"version": "1.1.0-preview4-final",
"imports": "portable-net451+win8"
},
"Microsoft.DotNet.Watcher.Tools": {
"version": "1.0.0-preview2-final",
"version": "1.1.0-preview4-final",
"imports": "portable-net451+win8"
}
},
Expand Down

0 comments on commit b46715e

Please sign in to comment.