From 6df7aa6c063696ac59147b3f06999058cb189550 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sat, 17 Sep 2016 13:08:50 +0200
Subject: [PATCH 1/2] Disable xunit appdomains on non-Windows.

---
 build.cake | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.cake b/build.cake
index 8806f29cec..eeff7c0010 100644
--- a/build.cake
+++ b/build.cake
@@ -660,9 +660,9 @@ Task("Run-Unit-Tests")
         Parallelism = ParallelismOption.None 
     };
 
-    if (isRunningOnWindows)
+    if (!isRunningOnWindows)
     {
-        settings.NoAppDomain = false;
+        settings.NoAppDomain = true;
     }
 
     foreach (var file in unitTests)

From 95a623f6cf460ca19749b61184a1d2fe196b3763 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sat, 17 Sep 2016 13:21:01 +0200
Subject: [PATCH 2/2] Updated XUnit NoAppDomain setting.

On advice from @wieslawsoltes.
---
 build.cake | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/build.cake b/build.cake
index eeff7c0010..cb8ed5b9f5 100644
--- a/build.cake
+++ b/build.cake
@@ -660,10 +660,7 @@ Task("Run-Unit-Tests")
         Parallelism = ParallelismOption.None 
     };
 
-    if (!isRunningOnWindows)
-    {
-        settings.NoAppDomain = true;
-    }
+    settings.NoAppDomain = !isRunningOnWindows;
 
     foreach (var file in unitTests)
     {