Transition to netstandard.

- dotnet5.X => netstandard1.y (where y = x-1).
- DNXCore50 => netstandardapp1.5.
- Applied the same changes to ifdefs.
This commit is contained in:
N. Taylor Mullen 2016-03-01 13:36:53 -08:00
parent 9a57f8116d
commit e3979fd3fe
19 changed files with 113 additions and 49 deletions

View File

@ -14,7 +14,11 @@
"web": "CookieSample" "web": "CookieSample"
}, },
"frameworks": { "frameworks": {
"dnx451": { }, "dnx451": {},
"dnxcore50": { } "netstandardapp1.5": {
"imports": [
"dnxcore50"
]
}
} }
} }

View File

@ -15,7 +15,11 @@
"web": "CookieSessionSample" "web": "CookieSessionSample"
}, },
"frameworks": { "frameworks": {
"dnx451": { }, "dnx451": {},
"dnxcore50": { } "netstandardapp1.5": {
"imports": [
"dnxcore50"
]
}
} }
} }

View File

@ -15,8 +15,12 @@
"web": "JwtBearerSample" "web": "JwtBearerSample"
}, },
"frameworks": { "frameworks": {
"dnx451": { }, "dnx451": {},
"dnxcore50": { } "netstandardapp1.5": {
"imports": [
"dnxcore50"
]
}
}, },
"exclude": [ "exclude": [
"wwwroot", "wwwroot",
@ -27,4 +31,4 @@
"**.vspscc" "**.vspscc"
], ],
"userSecretsId": "aspnet5-JwtBearerSample-20151210102827" "userSecretsId": "aspnet5-JwtBearerSample-20151210102827"
} }

View File

@ -10,7 +10,11 @@
}, },
"frameworks": { "frameworks": {
"dnx451": {}, "dnx451": {},
"dnxcore50": {} "netstandardapp1.5": {
"imports": [
"dnxcore50"
]
}
}, },
"compilationOptions": { "compilationOptions": {
"emitEntryPoint": true "emitEntryPoint": true

View File

@ -19,8 +19,12 @@
"web": "SocialSample" "web": "SocialSample"
}, },
"frameworks": { "frameworks": {
"dnx451": { }, "dnx451": {},
"dnxcore50": { } "netstandardapp1.5": {
"imports": [
"dnxcore50"
]
}
}, },
"userSecretsId": "aspnet5-SocialSample-20151210111056" "userSecretsId": "aspnet5-SocialSample-20151210111056"
} }

View File

@ -16,6 +16,10 @@
}, },
"frameworks": { "frameworks": {
"net451": {}, "net451": {},
"dotnet5.4": {} "netstandard1.3": {
"imports": [
"dotnet5.4"
]
}
} }
} }

View File

@ -14,8 +14,11 @@
}, },
"frameworks": { "frameworks": {
"net451": {}, "net451": {},
"dotnet5.4": { "netstandard1.3": {
"imports": "portable-net451+win8" "imports": [
"dotnet5.4",
"portable-net451+win8"
]
} }
} }
} }

View File

@ -14,8 +14,11 @@
}, },
"frameworks": { "frameworks": {
"net451": {}, "net451": {},
"dotnet5.4": { "netstandard1.3": {
"imports": "portable-net451+win8" "imports": [
"dotnet5.4",
"portable-net451+win8"
]
} }
} }
} }

View File

@ -14,9 +14,12 @@
"Microsoft.IdentityModel.Protocols.OpenIdConnect": "2.0.0-*" "Microsoft.IdentityModel.Protocols.OpenIdConnect": "2.0.0-*"
}, },
"frameworks": { "frameworks": {
"net451": { }, "net451": {},
"dotnet5.4": { "netstandard1.3": {
"imports": "portable-net451+win8" "imports": [
"dotnet5.4",
"portable-net451+win8"
]
} }
} }
} }

View File

@ -14,8 +14,11 @@
}, },
"frameworks": { "frameworks": {
"net451": {}, "net451": {},
"dotnet5.4": { "netstandard1.3": {
"imports": "portable-net451+win8" "imports": [
"dotnet5.4",
"portable-net451+win8"
]
} }
} }
} }

View File

@ -19,11 +19,14 @@
"System.Net.Http": "" "System.Net.Http": ""
} }
}, },
"dotnet5.4": { "netstandard1.3": {
"dependencies": { "dependencies": {
"System.Net.Http": "4.0.1-*" "System.Net.Http": "4.0.1-*"
}, },
"imports": "portable-net451+win8" "imports": [
"dotnet5.4",
"portable-net451+win8"
]
} }
} }
} }

View File

@ -15,8 +15,11 @@
}, },
"frameworks": { "frameworks": {
"net451": {}, "net451": {},
"dotnet5.4": { "netstandard1.3": {
"imports": "portable-net451+win8" "imports": [
"dotnet5.4",
"portable-net451+win8"
]
} }
} }
} }

View File

@ -18,10 +18,13 @@
"System.Net.Http": "" "System.Net.Http": ""
} }
}, },
"dotnet5.4": { "netstandard1.3": {
"dependencies": { "dependencies": {
"System.Net.Http": "4.0.1-*" "System.Net.Http": "4.0.1-*"
} },
"imports": [
"dotnet5.4"
]
} }
} }
} }

View File

@ -27,11 +27,14 @@
"System.Net.Http": "" "System.Net.Http": ""
} }
}, },
"dotnet5.4": { "netstandard1.3": {
"dependencies": { "dependencies": {
"System.Net.Http": "4.0.1-*" "System.Net.Http": "4.0.1-*"
}, },
"imports": "portable-net451" "imports": [
"dotnet5.4",
"portable-net451"
]
} }
} }
} }

View File

@ -14,11 +14,14 @@
"Microsoft.Extensions.Options": "1.0.0-*" "Microsoft.Extensions.Options": "1.0.0-*"
}, },
"frameworks": { "frameworks": {
"net451": { }, "net451": {},
"dotnet5.4": { "netstandard1.3": {
"dependencies": { "dependencies": {
"System.Security.Claims": "4.0.1-*" "System.Security.Claims": "4.0.1-*"
} },
"imports": [
"dotnet5.4"
]
} }
} }
} }

View File

@ -15,6 +15,10 @@
}, },
"frameworks": { "frameworks": {
"net451": {}, "net451": {},
"dotnet5.4": {} "netstandard1.3": {
"imports": [
"dotnet5.4"
]
}
} }
} }

View File

@ -16,11 +16,14 @@
"xunit": "2.1.0" "xunit": "2.1.0"
}, },
"frameworks": { "frameworks": {
"dnxcore50": { "netstandardapp1.5": {
"dependencies": { "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": { "net451": {
"frameworkAssemblies": { "frameworkAssemblies": {
@ -33,4 +36,4 @@
} }
}, },
"testRunner": "xunit" "testRunner": "xunit"
} }

View File

@ -11,11 +11,14 @@
"xunit": "2.1.0" "xunit": "2.1.0"
}, },
"frameworks": { "frameworks": {
"dnxcore50": { "netstandardapp1.5": {
"dependencies": { "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": { "net451": {
"frameworkAssemblies": { "frameworkAssemblies": {
@ -28,4 +31,4 @@
} }
}, },
"testRunner": "xunit" "testRunner": "xunit"
} }

View File

@ -10,11 +10,14 @@
"xunit": "2.1.0" "xunit": "2.1.0"
}, },
"frameworks": { "frameworks": {
"dnxcore50": { "netstandardapp1.5": {
"dependencies": { "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": { "net451": {
"frameworkAssemblies": { "frameworkAssemblies": {
@ -28,4 +31,4 @@
} }
}, },
"testRunner": "xunit" "testRunner": "xunit"
} }