diff --git a/GitHubVS.sln b/GitHubVS.sln index 7f6a1bbe38..ef0511ab00 100644 --- a/GitHubVS.sln +++ b/GitHubVS.sln @@ -13,7 +13,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Meta", "Meta", "{72036B62-2 README.md = README.md EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests", "src\UnitTests\UnitTests.csproj", "{596595A6-2A3C-469E-9386-9E3767D863A5}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests", "test\UnitTests\UnitTests.csproj", "{596595A6-2A3C-469E-9386-9E3767D863A5}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.UI", "src\GitHub.UI\GitHub.UI.csproj", "{346384DD-2445-4A28-AF22-B45F3957BD89}" EndProject @@ -95,7 +95,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CredentialManagement", "src EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ReactiveUI.Testing_Net45", "submodules\reactiveui\ReactiveUI.Testing\ReactiveUI.Testing_Net45.csproj", "{DD99FD0F-82F6-4C30-930E-4A1D0DF01D65}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TrackingCollectionTests", "src\TrackingCollectionTests\TrackingCollectionTests.csproj", "{7B835A7D-CF94-45E8-B191-96F5A4FE26A8}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TrackingCollectionTests", "test\TrackingCollectionTests\TrackingCollectionTests.csproj", "{7B835A7D-CF94-45E8-B191-96F5A4FE26A8}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitHub.TeamFoundation.14", "src\GitHub.TeamFoundation.14\GitHub.TeamFoundation.14.csproj", "{161DBF01-1DBF-4B00-8551-C5C00F26720D}" EndProject diff --git a/script b/script index ff9ea80d8d..58e42fc767 160000 --- a/script +++ b/script @@ -1 +1 @@ -Subproject commit ff9ea80d8df7c33fa94966ce4c8dbbd7896b8a07 +Subproject commit 58e42fc76756649e7fb30dc39ef9120b15a2f712 diff --git a/scripts/Run-NUnit.ps1 b/scripts/Run-NUnit.ps1 index 804696062d..aed96fa5bd 100644 --- a/scripts/Run-NUnit.ps1 +++ b/scripts/Run-NUnit.ps1 @@ -19,25 +19,25 @@ Param( $rootDirectory = Split-Path (Split-Path $MyInvocation.MyCommand.Path) Push-Location $rootDirectory -$dll = "src\$Project\bin\$Configuration\$Project.dll" +$dll = "test\$Project\bin\$Configuration\$Project.dll" if ($AppVeyor) { - $nunitDirectory = Join-Path $rootDirectory packages\NUnit.Runners.2.6.4\tools - $consoleRunner = Join-Path $nunitDirectory nunit-console-x86.exe - $args = "-noshadow", "-framework:net-4.5", "-exclude:Timings", $dll + $nunitDirectory = Join-Path $rootDirectory packages\NUnit.ConsoleRunner.3.7.0\tools + $consoleRunner = Join-Path $nunitDirectory nunit3-console.exe + $args = "--framework:net-4.5", "--where:cat!=Timings", $dll [object[]] $output = "$consoleRunner " + ($args -join " ") & $consoleRunner ($args | %{ "`"$_`"" }) if($LastExitCode -ne 0) { $host.SetShouldExit($LastExitCode) } } else { - $nunitDirectory = Join-Path $rootDirectory packages\NUnit.Runners.2.6.4\tools - $consoleRunner = Join-Path $nunitDirectory nunit-console-x86.exe + $nunitDirectory = Join-Path $rootDirectory packages\NUnit.ConsoleRunner.3.7.0\tools + $consoleRunner = Join-Path $nunitDirectory nunit3-console.exe $xml = Join-Path $rootDirectory "nunit-$Project.xml" $outputPath = [System.IO.Path]::GetTempFileName() - $args = "-noshadow", "-xml:$xml", "-framework:net-4.5", "-exclude:Timings", $dll + $args = "--result=$xml", "--framework:net-4.5", "--where:cat!=Timings", $dll [object[]] $output = "$consoleRunner " + ($args -join " ") $process = Start-Process -PassThru -NoNewWindow -RedirectStandardOutput $outputPath $consoleRunner ($args | %{ "`"$_`"" }) diff --git a/scripts/Run-XUnit.ps1 b/scripts/Run-XUnit.ps1 index 58170208be..009dcfdaa9 100644 --- a/scripts/Run-XUnit.ps1 +++ b/scripts/Run-XUnit.ps1 @@ -20,7 +20,7 @@ Param( $rootDirectory = Split-Path (Split-Path $MyInvocation.MyCommand.Path) Push-Location $rootDirectory -$dll = "src\$Project\bin\$Configuration\$Project.dll" +$dll = "test\$Project\bin\$Configuration\$Project.dll" if ($AppVeyor) { $xunitDirectory = Join-Path $rootDirectory packages\xunit.runner.console.2.1.0\tools diff --git a/test.cmd b/test.cmd deleted file mode 100644 index c782af306c..0000000000 --- a/test.cmd +++ /dev/null @@ -1,8 +0,0 @@ -@rem Tests currently only work on `Release` build. -@if "%config%" == "" set config=Release - -call "%ProgramFiles(x86)%\Microsoft Visual Studio 14.0\Common7\Tools\VsDevCmd.bat" - -msbuild GitHubVS.sln /p:Configuration=%Config% -VSTest.Console.exe src\UnitTests\bin\%Config%\UnitTests.dll /TestAdapterPath:"." -VSTest.Console.exe src\TrackingCollectionTests\bin\%Config%\TrackingCollectionTests.dll /TestAdapterPath:"." diff --git a/test/GitHub.UI.UnitTests/GitHub.UI.UnitTests.csproj b/test/GitHub.UI.UnitTests/GitHub.UI.UnitTests.csproj index 6c7e8314a0..8e76c3ace3 100644 --- a/test/GitHub.UI.UnitTests/GitHub.UI.UnitTests.csproj +++ b/test/GitHub.UI.UnitTests/GitHub.UI.UnitTests.csproj @@ -88,6 +88,9 @@ Designer + + +