Permalink
Browse files

Update to ASP.NET 1.1 (#542)

* update to 1.1 runtime

* vs tooling version

* update cake file to use netcoreapp1.1 for tests
  • Loading branch information...
1 parent aacebf3 commit 5f87762ea63808e6918d9520c3a3da2b8e064cb0 @leastprivilege leastprivilege committed on GitHub Dec 6, 2016
View
@@ -45,7 +45,7 @@ Task("RunTests")
if (!IsRunningOnWindows())
{
Information("Not running on Windows - skipping tests for full .NET Framework");
- settings.Framework = "netcoreapp1.0";
+ settings.Framework = "netcoreapp1.1";
}
DotNetCoreTest(project.GetDirectory().FullPath, settings);
View
@@ -1,6 +1,6 @@
{
"projects": [ "src", "test" ],
"sdk": {
- "version": "1.0.0-preview2-003121"
+ "version": "1.0.0-preview2-003131"
}
}
View
@@ -1,37 +1,35 @@
-{
+{
"dependencies": {
"Microsoft.NETCore.App": {
- "version": "1.0.*",
+ "version": "1.1.*",
"type": "platform"
},
- "Microsoft.AspNetCore.Server.IISIntegration": "1.0.*",
- "Microsoft.AspNetCore.Server.Kestrel": "1.0.*",
- "Microsoft.AspNetCore.Mvc": "1.0.*",
- "Microsoft.Extensions.Logging.Console": "1.0.*",
- "Microsoft.Extensions.Logging.Debug": "1.0.*",
- "Microsoft.AspNetCore.Diagnostics": "1.0.*",
- "Microsoft.AspNetCore.StaticFiles": "1.0.*",
- "Microsoft.AspNetCore.Authentication.Google": "1.0.*",
- "Microsoft.AspNetCore.Authentication.OpenIdConnect": "1.0.*",
-
"Serilog.Sinks.Literate": "2.0.0",
- "Serilog.Sinks.File": "3.0.1",
- "Serilog.Extensions.Logging": "1.2.0",
-
"IdentityServer4": {
"target": "project"
- }
+ },
+ "BundlerMinifier.Core": "2.2.306",
+ "Microsoft.AspNetCore.Authentication.Google": "1.1.0",
+ "Microsoft.AspNetCore.Authentication.OpenIdConnect": "1.1.0",
+ "Microsoft.AspNetCore.Diagnostics": "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.Extensions.Logging.Console": "1.1.0",
+ "Microsoft.Extensions.Logging.Debug": "1.1.0",
+ "Serilog.Extensions.Logging": "1.3.1",
+ "Serilog.Sinks.File": "3.1.1"
},
"tools": {
- "BundlerMinifier.Core": "2.0.238",
"Microsoft.DotNet.Watcher.Tools": "1.0.0-preview2-final",
"Microsoft.AspNetCore.Razor.Tools": "1.0.0-preview2-final",
"Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-preview2-final"
},
"frameworks": {
- "netcoreapp1.0": {
+ "netcoreapp1.1": {
"imports": [
"dotnet5.6",
"portable-net45+win8"
@@ -11,18 +11,18 @@
},
"dependencies": {
- "Microsoft.Extensions.DependencyInjection.Abstractions": "1.0.0",
- "Microsoft.Extensions.Options.ConfigurationExtensions": "1.0.0",
- "Microsoft.Extensions.Caching.Abstractions": "1.0.0",
- "Microsoft.Extensions.Caching.Memory": "1.0.0",
+ "Microsoft.Extensions.DependencyInjection.Abstractions": "1.1.0",
+ "Microsoft.Extensions.Options.ConfigurationExtensions": "1.1.0",
+ "Microsoft.Extensions.Caching.Abstractions": "1.1.0",
+ "Microsoft.Extensions.Caching.Memory": "1.1.0",
- "Microsoft.AspNetCore.Http.Abstractions": "1.0.0",
- "Microsoft.AspNetCore.Cors": "1.0.0",
- "Microsoft.AspNetCore.Authentication.Cookies": "1.0.0",
+ "Microsoft.AspNetCore.Http.Abstractions": "1.1.0",
+ "Microsoft.AspNetCore.Cors": "1.1.0",
+ "Microsoft.AspNetCore.Authentication.Cookies": "1.1.0",
- "System.IdentityModel.Tokens.Jwt": "5.0.0",
-
- "IdentityModel": "2.0.0"
+ "System.IdentityModel.Tokens.Jwt": "5.1.0",
+
+ "IdentityModel": "2.1.1"
},
"frameworks": {
@@ -32,8 +32,8 @@
"portable-net45+win8"
],
"dependencies": {
- "System.Collections.Specialized": "4.0.1",
- "System.Diagnostics.Process": "4.1.0"
+ "System.Collections.Specialized": "4.3.0",
+ "System.Diagnostics.Process": "4.3.0"
}
},
"net452": { }
@@ -4,22 +4,22 @@
"dependencies": {
"xunit": "2.2.0-beta2-build3300",
"dotnet-test-xunit": "2.2.0-preview2-build1029",
- "FluentAssertions": "4.6.1",
- "IdentityModel": "2.0.0",
- "Microsoft.AspNetCore.TestHost": "1.0.0",
- "Microsoft.AspNetCore.Http.Abstractions": "1.0.0",
+ "FluentAssertions": "4.17.0",
+ "Microsoft.AspNetCore.TestHost": "1.1.0",
+ "Microsoft.AspNetCore.Http.Abstractions": "1.1.0",
+ "Microsoft.Extensions.PlatformAbstractions": "1.1.0",
"Microsoft.AspNet.WebApi.Client": "5.2.3",
"IdentityServer4": {
"target": "project"
}
},
"frameworks": {
- "netcoreapp1.0": {
+ "netcoreapp1.1": {
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
- "version": "1.0.0"
+ "version": "1.1.0"
}
},
"imports": [
@@ -4,30 +4,30 @@
"dependencies": {
"xunit": "2.2.0-beta2-build3300",
"dotnet-test-xunit": "2.2.0-preview2-build1029",
- "FluentAssertions": "4.6.1",
- "Microsoft.AspNetCore.Http.Abstractions": "1.0.0",
- "Microsoft.Extensions.PlatformAbstractions": "1.0.0",
- "Microsoft.Extensions.Logging": "1.0.0",
+ "FluentAssertions": "4.17.0",
+ "Microsoft.AspNetCore.Http.Abstractions": "1.1.0",
+ "Microsoft.Extensions.PlatformAbstractions": "1.1.0",
+ "Microsoft.Extensions.Logging": "1.1.0",
"IdentityServer4": {
"target": "project"
},
- "Microsoft.Extensions.DependencyInjection": "1.0.0"
+ "Microsoft.Extensions.DependencyInjection": "1.1.0"
},
"frameworks": {
- "netcoreapp1.0": {
+ "netcoreapp1.1": {
"dependencies": {
"Microsoft.NETCore.App": {
"type": "platform",
- "version": "1.0.0"
+ "version": "1.1.0"
}
},
"imports": [
"dnxcore50",
"portable-net45+win8"
]
},
- "net452": { }
+ "net452": {}
},
"buildOptions": {

0 comments on commit 5f87762

Please sign in to comment.