test passing on mac and windows

2025-10-31 16:25:27 +08:00 · 2017-01-17 10:33:55 +00:00
parent a8878b4a19
commit 8c213f133c
6 changed files with 19 additions and 9 deletions
--- a/src/Ocelot/project.json
+++ b/src/Ocelot/project.json
@@ -31,7 +31,8 @@
  },
  "runtimes": {
    "win10-x64": {},
-    "osx.10.11-x64":{}
+    "osx.10.11-x64":{},
+    "win7-x64": {}
  },
  "frameworks": {
    "netcoreapp1.4": {
--- a/test/Ocelot.AcceptanceTests/TestConfiguration.cs
+++ b/test/Ocelot.AcceptanceTests/TestConfiguration.cs
@@ -16,14 +16,19 @@

            if(RuntimeInformation.OSDescription.ToLower().Contains("darwin"))
            {
-                oSDescription = "osx.10.11";
+                return FormatConfigurationPath("osx.10.11", osArchitecture);
            }

-            if(RuntimeInformation.OSDescription.ToLower().Contains("windows"))
-            {
-                oSDescription = "win10";
+            if(RuntimeInformation.OSDescription.ToLower().Contains("microsoft windows 10"))
+            {                
+                return FormatConfigurationPath("win10", osArchitecture);
            }
+            
+            return FormatConfigurationPath("win7", osArchitecture);
+        }

+        private static string FormatConfigurationPath(string oSDescription, string osArchitecture)
+        {
            var runTime = $"{oSDescription}-{osArchitecture}".ToLower();

            var configPath = $"./bin/Debug/netcoreapp{Version}/{runTime}/configuration.json";
--- a/test/Ocelot.AcceptanceTests/project.json
+++ b/test/Ocelot.AcceptanceTests/project.json
@@ -36,7 +36,8 @@
  },
  "runtimes": {
    "win10-x64": {},
-    "osx.10.11-x64":{}
+    "osx.10.11-x64":{},
+    "win7-x64": {}
  },
  "frameworks": {
    "netcoreapp1.4": {
--- a/test/Ocelot.Benchmarks/project.json
+++ b/test/Ocelot.Benchmarks/project.json
@@ -10,7 +10,8 @@
  },
  "runtimes": {
    "win10-x64": {},
-    "osx.10.11-x64":{}
+    "osx.10.11-x64":{},
+    "win7-x64": {}
  },
  "frameworks": {
    "netcoreapp1.4": {
--- a/test/Ocelot.ManualTest/project.json
+++ b/test/Ocelot.ManualTest/project.json
@@ -20,7 +20,8 @@
  },
  "runtimes": {
    "win10-x64": {},
-    "osx.10.11-x64":{}
+    "osx.10.11-x64":{},
+    "win7-x64": {}
  },
  "frameworks": {
    "netcoreapp1.4": {
--- a/test/Ocelot.UnitTests/project.json
+++ b/test/Ocelot.UnitTests/project.json
@@ -28,7 +28,8 @@
  },
  "runtimes": {
    "win10-x64": {},
-    "osx.10.11-x64":{}
+    "osx.10.11-x64":{},
+    "win7-x64": {}
  },
  "frameworks": {
    "netcoreapp1.4": {