huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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:37:03 -08:00
parent ca83e8af78
commit bb7cb4a0d9
8 changed files with 51 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
samples/RoutingSample.Web/project.json
View File

@ -12,9 +12,12 @@
"web": "RoutingSample.Web"
},
"frameworks": {
"dnx451": { },
"dnxcore50": {
"imports": "portable-net451+win8"
"dnx451": {},
"netstandardapp1.5": {
"imports": [
"dnxcore50",
"portable-net451+win8"
]
}
}
}
}

15
src/Microsoft.AspNetCore.Routing.Abstractions/project.json
View File

@ -8,7 +8,9 @@
"compilationOptions": {
"warningsAsErrors": true,
"keyFile": "../../tools/Key.snk",
"nowarn": [ "CS1591" ],
"nowarn": [
"CS1591"
],
"xmlDoc": true
},
"dependencies": {
@ -19,13 +21,16 @@
}
},
"frameworks": {
"net451": { },
"dotnet5.4": {
"net451": {},
"netstandard1.3": {
"dependencies": {
"System.Collections.Concurrent": "4.0.12-*",
"System.Threading.Tasks": "4.0.11-*",
"System.Reflection.Extensions": "4.0.1-*"
}
},
"imports": [
"dotnet5.4"
]
}
}
}
}

12
src/Microsoft.AspNetCore.Routing.DecisionTree.Sources/project.json
View File

@ -11,10 +11,12 @@
},
"shared": "**/*.cs",
"frameworks": {
"net451": { },
"dotnet5.4": {
"dependencies": {
}
"net451": {},
"netstandard1.3": {
"dependencies": {},
"imports": [
"dotnet5.4"
]
}
}
}
}

2
src/Microsoft.AspNetCore.Routing/Internal/TaskCache.cs
View File

@ -7,7 +7,7 @@ namespace Microsoft.AspNetCore.Routing.Internal
{
public static class TaskCache
{
#if DOTNET5_4
#if NETSTANDARD1_3
public static readonly Task CompletedTask = Task.CompletedTask;
#else
public static readonly Task CompletedTask = Task.FromResult(0);

17
src/Microsoft.AspNetCore.Routing/project.json
View File

@ -8,7 +8,9 @@
"compilationOptions": {
"warningsAsErrors": true,
"keyFile": "../../tools/Key.snk",
"nowarn": [ "CS1591" ],
"nowarn": [
"CS1591"
],
"xmlDoc": true
},
"dependencies": {
@ -31,12 +33,15 @@
}
},
"frameworks": {
"net451": { },
"dotnet5.4": {
"net451": {},
"netstandard1.3": {
"dependencies": {
"System.Collections": "4.0.11-*",
"System.Text.RegularExpressions": "4.0.12-*",
}
"System.Text.RegularExpressions": "4.0.12-*"
},
"imports": [
"dotnet5.4"
]
}
}
}
}

7
test/Microsoft.AspNetCore.Mvc.Routing.Abstractions.Tests/project.json
View File

@ -9,12 +9,15 @@
"xunit": "2.1.0"
},
"frameworks": {
"dnxcore50": {
"netstandardapp1.5": {
"dependencies": {
"moq.netcore": "4.4.0-beta8",
"dotnet-test-xunit": "1.0.0-dev-*"
},
"imports": "portable-net451+win8"
"imports": [
"dnxcore50",
"portable-net451+win8"
]
},
"net451": {
"frameworkAssemblies": {

7
test/Microsoft.AspNetCore.Routing.DecisionTree.Sources.Tests/project.json
View File

@ -13,11 +13,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": {

7
test/Microsoft.AspNetCore.Routing.Tests/project.json
View File

@ -14,12 +14,15 @@
"xunit": "2.1.0"
},
"frameworks": {
"dnxcore50": {
"netstandardapp1.5": {
"dependencies": {
"moq.netcore": "4.4.0-beta8",
"dotnet-test-xunit": "1.0.0-dev-*"
},
"imports": "portable-net451+win8"
"imports": [
"dnxcore50",
"portable-net451+win8"
]
},
"net451": {
"frameworkAssemblies": {