From e3979fd3feb5d55b47bb4115f2afd0cf61f632b0 Mon Sep 17 00:00:00 2001 From: "N. Taylor Mullen" Date: Tue, 1 Mar 2016 13:36:53 -0800 Subject: [PATCH] Transition to netstandard. - dotnet5.X => netstandard1.y (where y = x-1). - DNXCore50 => netstandardapp1.5. - Applied the same changes to ifdefs. --- samples/CookieSample/project.json | 10 +++++++--- samples/CookieSessionSample/project.json | 10 +++++++--- samples/JwtBearerSample/project.json | 10 +++++++--- samples/OpenIdConnectSample/project.json | 6 +++++- samples/SocialSample/project.json | 10 +++++++--- .../project.json | 6 +++++- .../project.json | 7 +++++-- .../project.json | 7 +++++-- .../project.json | 11 +++++++---- .../project.json | 7 +++++-- .../project.json | 9 ++++++--- .../project.json | 7 +++++-- .../project.json | 9 ++++++--- src/Microsoft.AspNetCore.Authentication/project.json | 9 ++++++--- src/Microsoft.AspNetCore.Authorization/project.json | 9 ++++++--- src/Microsoft.AspNetCore.CookiePolicy/project.json | 6 +++++- .../project.json | 9 ++++++--- .../project.json | 11 +++++++---- .../project.json | 9 ++++++--- 19 files changed, 113 insertions(+), 49 deletions(-) diff --git a/samples/CookieSample/project.json b/samples/CookieSample/project.json index fa17dd9cf3..a3e9f4556d 100644 --- a/samples/CookieSample/project.json +++ b/samples/CookieSample/project.json @@ -14,7 +14,11 @@ "web": "CookieSample" }, "frameworks": { - "dnx451": { }, - "dnxcore50": { } + "dnx451": {}, + "netstandardapp1.5": { + "imports": [ + "dnxcore50" + ] + } } -} +} \ No newline at end of file diff --git a/samples/CookieSessionSample/project.json b/samples/CookieSessionSample/project.json index 8de831b403..e60b1b355c 100644 --- a/samples/CookieSessionSample/project.json +++ b/samples/CookieSessionSample/project.json @@ -15,7 +15,11 @@ "web": "CookieSessionSample" }, "frameworks": { - "dnx451": { }, - "dnxcore50": { } + "dnx451": {}, + "netstandardapp1.5": { + "imports": [ + "dnxcore50" + ] + } } -} +} \ No newline at end of file diff --git a/samples/JwtBearerSample/project.json b/samples/JwtBearerSample/project.json index 436a2203be..0f6a6c9df5 100644 --- a/samples/JwtBearerSample/project.json +++ b/samples/JwtBearerSample/project.json @@ -15,8 +15,12 @@ "web": "JwtBearerSample" }, "frameworks": { - "dnx451": { }, - "dnxcore50": { } + "dnx451": {}, + "netstandardapp1.5": { + "imports": [ + "dnxcore50" + ] + } }, "exclude": [ "wwwroot", @@ -27,4 +31,4 @@ "**.vspscc" ], "userSecretsId": "aspnet5-JwtBearerSample-20151210102827" -} +} \ No newline at end of file diff --git a/samples/OpenIdConnectSample/project.json b/samples/OpenIdConnectSample/project.json index e5bec9e8c6..12d88dfed1 100644 --- a/samples/OpenIdConnectSample/project.json +++ b/samples/OpenIdConnectSample/project.json @@ -10,7 +10,11 @@ }, "frameworks": { "dnx451": {}, - "dnxcore50": {} + "netstandardapp1.5": { + "imports": [ + "dnxcore50" + ] + } }, "compilationOptions": { "emitEntryPoint": true diff --git a/samples/SocialSample/project.json b/samples/SocialSample/project.json index 00570902f6..a4c71e0b70 100644 --- a/samples/SocialSample/project.json +++ b/samples/SocialSample/project.json @@ -19,8 +19,12 @@ "web": "SocialSample" }, "frameworks": { - "dnx451": { }, - "dnxcore50": { } + "dnx451": {}, + "netstandardapp1.5": { + "imports": [ + "dnxcore50" + ] + } }, "userSecretsId": "aspnet5-SocialSample-20151210111056" -} +} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Authentication.Cookies/project.json b/src/Microsoft.AspNetCore.Authentication.Cookies/project.json index 5ceb5b7a64..46666ed124 100644 --- a/src/Microsoft.AspNetCore.Authentication.Cookies/project.json +++ b/src/Microsoft.AspNetCore.Authentication.Cookies/project.json @@ -16,6 +16,10 @@ }, "frameworks": { "net451": {}, - "dotnet5.4": {} + "netstandard1.3": { + "imports": [ + "dotnet5.4" + ] + } } } \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Authentication.Facebook/project.json b/src/Microsoft.AspNetCore.Authentication.Facebook/project.json index 5dbf6f6cfb..e93b2feb4d 100644 --- a/src/Microsoft.AspNetCore.Authentication.Facebook/project.json +++ b/src/Microsoft.AspNetCore.Authentication.Facebook/project.json @@ -14,8 +14,11 @@ }, "frameworks": { "net451": {}, - "dotnet5.4": { - "imports": "portable-net451+win8" + "netstandard1.3": { + "imports": [ + "dotnet5.4", + "portable-net451+win8" + ] } } } \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Authentication.Google/project.json b/src/Microsoft.AspNetCore.Authentication.Google/project.json index 929424cc14..d250dee275 100644 --- a/src/Microsoft.AspNetCore.Authentication.Google/project.json +++ b/src/Microsoft.AspNetCore.Authentication.Google/project.json @@ -14,8 +14,11 @@ }, "frameworks": { "net451": {}, - "dotnet5.4": { - "imports": "portable-net451+win8" + "netstandard1.3": { + "imports": [ + "dotnet5.4", + "portable-net451+win8" + ] } } } \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Authentication.JwtBearer/project.json b/src/Microsoft.AspNetCore.Authentication.JwtBearer/project.json index f6e200b7c2..21be97e4b8 100644 --- a/src/Microsoft.AspNetCore.Authentication.JwtBearer/project.json +++ b/src/Microsoft.AspNetCore.Authentication.JwtBearer/project.json @@ -14,9 +14,12 @@ "Microsoft.IdentityModel.Protocols.OpenIdConnect": "2.0.0-*" }, "frameworks": { - "net451": { }, - "dotnet5.4": { - "imports": "portable-net451+win8" + "net451": {}, + "netstandard1.3": { + "imports": [ + "dotnet5.4", + "portable-net451+win8" + ] } } -} +} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Authentication.MicrosoftAccount/project.json b/src/Microsoft.AspNetCore.Authentication.MicrosoftAccount/project.json index c415b2a63f..468955a931 100644 --- a/src/Microsoft.AspNetCore.Authentication.MicrosoftAccount/project.json +++ b/src/Microsoft.AspNetCore.Authentication.MicrosoftAccount/project.json @@ -14,8 +14,11 @@ }, "frameworks": { "net451": {}, - "dotnet5.4": { - "imports": "portable-net451+win8" + "netstandard1.3": { + "imports": [ + "dotnet5.4", + "portable-net451+win8" + ] } } } \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Authentication.OAuth/project.json b/src/Microsoft.AspNetCore.Authentication.OAuth/project.json index c5128412c4..dc073ab7ba 100644 --- a/src/Microsoft.AspNetCore.Authentication.OAuth/project.json +++ b/src/Microsoft.AspNetCore.Authentication.OAuth/project.json @@ -19,11 +19,14 @@ "System.Net.Http": "" } }, - "dotnet5.4": { + "netstandard1.3": { "dependencies": { "System.Net.Http": "4.0.1-*" }, - "imports": "portable-net451+win8" + "imports": [ + "dotnet5.4", + "portable-net451+win8" + ] } } -} +} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/project.json b/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/project.json index 90487a898b..fc58e6a890 100644 --- a/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/project.json +++ b/src/Microsoft.AspNetCore.Authentication.OpenIdConnect/project.json @@ -15,8 +15,11 @@ }, "frameworks": { "net451": {}, - "dotnet5.4": { - "imports": "portable-net451+win8" + "netstandard1.3": { + "imports": [ + "dotnet5.4", + "portable-net451+win8" + ] } } } \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Authentication.Twitter/project.json b/src/Microsoft.AspNetCore.Authentication.Twitter/project.json index 67ebf2c0db..8dd3556bcc 100644 --- a/src/Microsoft.AspNetCore.Authentication.Twitter/project.json +++ b/src/Microsoft.AspNetCore.Authentication.Twitter/project.json @@ -18,10 +18,13 @@ "System.Net.Http": "" } }, - "dotnet5.4": { + "netstandard1.3": { "dependencies": { "System.Net.Http": "4.0.1-*" - } + }, + "imports": [ + "dotnet5.4" + ] } } -} +} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Authentication/project.json b/src/Microsoft.AspNetCore.Authentication/project.json index d34a6697bc..73f7ed80d2 100644 --- a/src/Microsoft.AspNetCore.Authentication/project.json +++ b/src/Microsoft.AspNetCore.Authentication/project.json @@ -27,11 +27,14 @@ "System.Net.Http": "" } }, - "dotnet5.4": { + "netstandard1.3": { "dependencies": { "System.Net.Http": "4.0.1-*" }, - "imports": "portable-net451" + "imports": [ + "dotnet5.4", + "portable-net451" + ] } } -} +} \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.Authorization/project.json b/src/Microsoft.AspNetCore.Authorization/project.json index 688fd84037..f07e8d2d5d 100644 --- a/src/Microsoft.AspNetCore.Authorization/project.json +++ b/src/Microsoft.AspNetCore.Authorization/project.json @@ -14,11 +14,14 @@ "Microsoft.Extensions.Options": "1.0.0-*" }, "frameworks": { - "net451": { }, - "dotnet5.4": { + "net451": {}, + "netstandard1.3": { "dependencies": { "System.Security.Claims": "4.0.1-*" - } + }, + "imports": [ + "dotnet5.4" + ] } } } \ No newline at end of file diff --git a/src/Microsoft.AspNetCore.CookiePolicy/project.json b/src/Microsoft.AspNetCore.CookiePolicy/project.json index a2c04f1455..ce4c552dc9 100644 --- a/src/Microsoft.AspNetCore.CookiePolicy/project.json +++ b/src/Microsoft.AspNetCore.CookiePolicy/project.json @@ -15,6 +15,10 @@ }, "frameworks": { "net451": {}, - "dotnet5.4": {} + "netstandard1.3": { + "imports": [ + "dotnet5.4" + ] + } } } \ No newline at end of file diff --git a/test/Microsoft.AspNetCore.Authentication.Test/project.json b/test/Microsoft.AspNetCore.Authentication.Test/project.json index eb36173bf2..c05a8963b7 100644 --- a/test/Microsoft.AspNetCore.Authentication.Test/project.json +++ b/test/Microsoft.AspNetCore.Authentication.Test/project.json @@ -16,11 +16,14 @@ "xunit": "2.1.0" }, "frameworks": { - "dnxcore50": { + "netstandardapp1.5": { "dependencies": { "dotnet-test-xunit": "1.0.0-dev-*" }, - "imports": "portable-net451+win8" + "imports": [ + "dnxcore50", + "portable-net451+win8" + ] }, "net451": { "frameworkAssemblies": { @@ -33,4 +36,4 @@ } }, "testRunner": "xunit" -} +} \ No newline at end of file diff --git a/test/Microsoft.AspNetCore.Authorization.Test/project.json b/test/Microsoft.AspNetCore.Authorization.Test/project.json index 651b9acb69..560766c038 100644 --- a/test/Microsoft.AspNetCore.Authorization.Test/project.json +++ b/test/Microsoft.AspNetCore.Authorization.Test/project.json @@ -11,11 +11,14 @@ "xunit": "2.1.0" }, "frameworks": { - "dnxcore50": { + "netstandardapp1.5": { "dependencies": { - "dotnet-test-xunit": "1.0.0-dev-*" + "dotnet-test-xunit": "1.0.0-dev-*" }, - "imports": "portable-net451+win8" + "imports": [ + "dnxcore50", + "portable-net451+win8" + ] }, "net451": { "frameworkAssemblies": { @@ -28,4 +31,4 @@ } }, "testRunner": "xunit" -} +} \ No newline at end of file diff --git a/test/Microsoft.AspNetCore.CookiePolicy.Test/project.json b/test/Microsoft.AspNetCore.CookiePolicy.Test/project.json index db1fce596a..f6dad148ab 100644 --- a/test/Microsoft.AspNetCore.CookiePolicy.Test/project.json +++ b/test/Microsoft.AspNetCore.CookiePolicy.Test/project.json @@ -10,11 +10,14 @@ "xunit": "2.1.0" }, "frameworks": { - "dnxcore50": { + "netstandardapp1.5": { "dependencies": { "dotnet-test-xunit": "1.0.0-dev-*" }, - "imports": "portable-net451+win8" + "imports": [ + "dnxcore50", + "portable-net451+win8" + ] }, "net451": { "frameworkAssemblies": { @@ -28,4 +31,4 @@ } }, "testRunner": "xunit" -} +} \ No newline at end of file