tk/Ocelot
1
0
Fork 0
mirror of https://github.com/nsnail/Ocelot.git synced 2025-04-22 06:22:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

test passing on mac and windows

Browse Source
This commit is contained in:
Tom Gardham-Pallister 2017-01-17 10:33:55 +00:00
parent a8878b4a19
commit 8c213f133c
6 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Ocelot/project.json
View File

@ -31,7 +31,8 @@
}, },
"runtimes": { "runtimes": {
"win10-x64": {}, "win10-x64": {},
"osx.10.11-x64":{} "osx.10.11-x64":{},
"win7-x64": {}
}, },
"frameworks": { "frameworks": {
"netcoreapp1.4": { "netcoreapp1.4": {

11
test/Ocelot.AcceptanceTests/TestConfiguration.cs
View File

@ -16,14 +16,19 @@
if(RuntimeInformation.OSDescription.ToLower().Contains("darwin")) if(RuntimeInformation.OSDescription.ToLower().Contains("darwin"))
{ {
oSDescription = "osx.10.11"; return FormatConfigurationPath("osx.10.11", osArchitecture);
} }
if(RuntimeInformation.OSDescription.ToLower().Contains("windows")) if(RuntimeInformation.OSDescription.ToLower().Contains("microsoft windows 10"))
{ {
oSDescription = "win10"; return FormatConfigurationPath("win10", osArchitecture);
} }
return FormatConfigurationPath("win7", osArchitecture);
}
private static string FormatConfigurationPath(string oSDescription, string osArchitecture)
{
var runTime = $"{oSDescription}-{osArchitecture}".ToLower(); var runTime = $"{oSDescription}-{osArchitecture}".ToLower();
var configPath = $"./bin/Debug/netcoreapp{Version}/{runTime}/configuration.json"; var configPath = $"./bin/Debug/netcoreapp{Version}/{runTime}/configuration.json";

3
test/Ocelot.AcceptanceTests/project.json
View File

@ -36,7 +36,8 @@
}, },
"runtimes": { "runtimes": {
"win10-x64": {}, "win10-x64": {},
"osx.10.11-x64":{} "osx.10.11-x64":{},
"win7-x64": {}
}, },
"frameworks": { "frameworks": {
"netcoreapp1.4": { "netcoreapp1.4": {

3
test/Ocelot.Benchmarks/project.json
View File

@ -10,7 +10,8 @@
}, },
"runtimes": { "runtimes": {
"win10-x64": {}, "win10-x64": {},
"osx.10.11-x64":{} "osx.10.11-x64":{},
"win7-x64": {}
}, },
"frameworks": { "frameworks": {
"netcoreapp1.4": { "netcoreapp1.4": {

3
test/Ocelot.ManualTest/project.json
View File

@ -20,7 +20,8 @@
}, },
"runtimes": { "runtimes": {
"win10-x64": {}, "win10-x64": {},
"osx.10.11-x64":{} "osx.10.11-x64":{},
"win7-x64": {}
}, },
"frameworks": { "frameworks": {
"netcoreapp1.4": { "netcoreapp1.4": {

3
test/Ocelot.UnitTests/project.json
View File

@ -28,7 +28,8 @@
}, },
"runtimes": { "runtimes": {
"win10-x64": {}, "win10-x64": {},
"osx.10.11-x64":{} "osx.10.11-x64":{},
"win7-x64": {}
}, },
"frameworks": { "frameworks": {
"netcoreapp1.4": { "netcoreapp1.4": {