From 8c213f133cc57fa9bfa97758d8c9ef067f095a1a Mon Sep 17 00:00:00 2001
From: Tom Gardham-Pallister <tom.pallister@fourth.com>
Date: Tue, 17 Jan 2017 10:33:55 +0000
Subject: [PATCH] test passing on mac and windows

---
 src/Ocelot/project.json                          |  3 ++-
 test/Ocelot.AcceptanceTests/TestConfiguration.cs | 13 +++++++++----
 test/Ocelot.AcceptanceTests/project.json         |  3 ++-
 test/Ocelot.Benchmarks/project.json              |  3 ++-
 test/Ocelot.ManualTest/project.json              |  3 ++-
 test/Ocelot.UnitTests/project.json               |  3 ++-
 6 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/Ocelot/project.json b/src/Ocelot/project.json
index cd6cbff5..85008568 100644
--- 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": {
diff --git a/test/Ocelot.AcceptanceTests/TestConfiguration.cs b/test/Ocelot.AcceptanceTests/TestConfiguration.cs
index 627d0ff4..a9776c1b 100644
--- 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";
diff --git a/test/Ocelot.AcceptanceTests/project.json b/test/Ocelot.AcceptanceTests/project.json
index 4d33f2d5..4b364510 100644
--- 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": {
diff --git a/test/Ocelot.Benchmarks/project.json b/test/Ocelot.Benchmarks/project.json
index 4c98cf40..da310ddd 100644
--- 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": {
diff --git a/test/Ocelot.ManualTest/project.json b/test/Ocelot.ManualTest/project.json
index 774eabfa..181bdb07 100644
--- 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": {
diff --git a/test/Ocelot.UnitTests/project.json b/test/Ocelot.UnitTests/project.json
index 6ab9025a..605b25d6 100644
--- 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": {