Skip to content
Browse files

Use the right path to the xunit msbuild runner.

  • Loading branch information...
1 parent 9b1e397 commit 0e5c8150539cbff8e16609652603979998f17d5e @spraints spraints committed
Showing with 3 additions and 14 deletions.
  1. +1 −1 .nuget/nuget.targets
  2. +2 −13 CI.proj
View
2 .nuget/nuget.targets
@@ -27,7 +27,7 @@
<PropertyGroup Condition=" '$(OS)' == 'Windows_NT'">
<!-- Windows specific commands -->
<NuGetToolsPath>$([System.IO.Path]::Combine($(SolutionDir), ".nuget"))</NuGetToolsPath>
- <PackagesConfig>$([System.IO.Path]::Combine($(ProjectDir), "packages.config"))</PackagesConfig>
+ <PackagesConfig Condition=" '$(PackagesConfig)' == '' ">$([System.IO.Path]::Combine($(ProjectDir), "packages.config"))</PackagesConfig>
<PackagesDir>$([System.IO.Path]::Combine($(SolutionDir), "packages"))</PackagesDir>
</PropertyGroup>
View
15 CI.proj
@@ -14,20 +14,9 @@
<MSBuild Projects="GitTfs.sln" Properties="Configuration=Debug;RequireRestoreConsent=false" Targets="GitTfsTest" />
</Target>
- <PropertyGroup>
- <RealRunTests Condition=" '$(OS)' != 'Windows_NT' ">RunTestsWithMonoRunner</RealRunTests>
- <RealRunTests Condition=" '$(RealRunTests)' == '' ">RunTestsWithTask</RealRunTests>
- </PropertyGroup>
-
- <Target Name="RunTests" DependsOnTargets="RestorePackages;$(RealRunTests)" />
-
- <UsingTask AssemblyFile="packages/xunit.runner.1.9.1/tools/xunit.runner.msbuild.dll" TaskName="Xunit.Runner.MSBuild.xunit" />
- <Target Name="RunTestsWithTask">
+ <UsingTask AssemblyFile="packages/xunit.runners.1.9.1/tools/xunit.runner.msbuild.dll" TaskName="Xunit.Runner.MSBuild.xunit" />
+ <Target Name="RunTests" DependsOnTargets="RestorePackages">
<xunit Assembly="GitTfsTest/bin/Debug/GitTfsTest.dll" />
</Target>
- <Target Name="RunTestsWithMonoRunner">
- <Exec Command="mono packages/xunit.runners.1.9.1/tools/xunit.console.clr4.exe GitTfsTest/bin/Debug/GitTfsTest.dll" />
- </Target>
-
</Project>

0 comments on commit 0e5c815

Please sign in to comment.
Something went wrong with that request. Please try again.