Fixed build and test.

ite-klass · Oct 31, 2015 · 4bf4f67 · 4bf4f67
1 parent e12f75e
commit 4bf4f67
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/Build.ps1 b/Build.ps1
@@ -40,7 +40,7 @@ function Build-Projects
 function Test-Projects
 {
     param([string] $DirectoryName)
-    & dnx ("""" + $DirectoryName + """") test; if($LASTEXITCODE -ne 0) { exit 2 }
+    & dnx -p ("""" + $DirectoryName + """") test; if($LASTEXITCODE -ne 0) { exit 2 }
 }
 
 function Remove-PathVariable

diff --git a/Serilog.sln b/Serilog.sln
@@ -12,6 +12,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "assets", "assets", "{E9D1B5
 		.editorconfig = .editorconfig
 		Build.ps1 = Build.ps1
 		assets\CommonAssemblyInfo.cs = assets\CommonAssemblyInfo.cs
+		global.json = global.json
 		NuGet.Config = NuGet.Config
 		README.md = README.md
 		assets\Serilog.snk = assets\Serilog.snk

diff --git a/test/Serilog.Tests/Context/LogContextTests.cs b/test/Serilog.Tests/Context/LogContextTests.cs
@@ -145,6 +145,12 @@ public async Task ContextPropertiesPersistWhenCrossAppDomainCallsAreEnabled()
         [Fact]
         public void DoesNotPreventCrossDomainCalls()
         {
+            var projectRoot = Environment.CurrentDirectory;
+            while (!File.Exists(Path.Combine(projectRoot, "global.json")))
+            {
+                projectRoot = Directory.GetParent(projectRoot).FullName;
+            }
+
             AppDomain domain = null;
             try
             {
@@ -157,7 +163,7 @@ public void DoesNotPreventCrossDomainCalls()
 
                 var domaininfo = new AppDomainSetup
                 {
-                    ApplicationBase = @"..\..\artifacts\bin\",
+                    ApplicationBase = Path.Combine(projectRoot, @"artifacts\bin\"),
                     PrivateBinPath = @"Serilog\Debug\dnx451;Serilog.Tests\Debug\dnx451".Replace("Debug", configuration)
                 };
                 var evidence = AppDomain.CurrentDomain.Evidence;