Update test scripts for new directory structure

Author: markcowl

src/lib/test.net472.config

@@ -7,9 +7,9 @@
                           publicKeyToken="30ad4fe6b2a6aeed"
                           culture="neutral" />
         <codeBase version="9.0.0.0"
-                  href="../../../../../../lib/Newtonsoft.Json.9.dll"/>
+                  href="../../../../../lib/Newtonsoft.Json.9.dll"/>
         <codeBase version="10.0.0.0"
-                  href="../../../../../../lib/Newtonsoft.Json.10.dll"/>
+                  href="../../../../../lib/Newtonsoft.Json.10.dll"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

tools/TestNet472Modules.ps1

@@ -12,18 +12,31 @@ $srcPath = (Join-Path $dirPath -ChildPath 'src')
 $libPath = (Join-Path $srcPath -ChildPath 'lib')
 $testConfig = (Join-Path $libPath -ChildPath 'test.net472.config')
 $rmItems = Get-ChildItem -Recurse -Path $srcPath -Include *.Test.dll `
-  | Where {$_.FullName.Contains('bin\Debug\net472')}
+  | Where {$_.FullName.Contains('bin\Debug\netstandard2.0')}
 
 if ($ModuleFilter)
 {
     $rmItems = $rmItems | Where {$_.FullName.Contains($ModuleFilter)}
 }
 
 $rmItems | %{`
-  Write-Host "Testing $_.FullName"
-  Start-Process -FilePath $TestExecPath `
+  Write-Host ("Testing " + $_.FullName)
+  $testDir = $_.Directory.FullName
+  $testExec = Get-Item $TestExecPath
+  $testExecDir = $testExec.Directory.FullName
+  $testExecFile = $testExec.Name
+  $newExecPath = Join-Path $testDir -ChildPath $testExecFile
+  $copiedItems = (Get-ChildItem $testExecDir | Where-Object {$_.Name.StartsWith("xunit")})
+  $copiedItems | Copy-Item -Destination $testDir
+  try {
+  Start-Process -FilePath $newExecPath `
     -Wait `
-    -WorkingDirectory $PSScriptRoot\..\artifacts `
+    -WorkingDirectory $testDir `
     -NoNewWindow `
     -ArgumentList $_.FullName, $testConfig, '-trait "AcceptanceType=CheckIn"', '-notrait "Runtype=DesktopOnly"'`
+  }
+  finally {
+    $copiedItems | %{Remove-Item -Force (Join-Path $testDir $_.Name)}
+  }
 }
+