Repository: reef Updated Branches: refs/heads/master 316d51e4f -> ee1b6bbe6
[REEF-1314] Configure xunit.runner.console to be installed before test This change adds explicit restore of solution-level packages as a step before running test targets. This also removes explicit install of xunit console runner from AppVeyor script. JIRA: [REEF-1314](https://issues.apache.org/jira/browse/REEF-1314) Pull request: This closes #928 Project: http://git-wip-us.apache.org/repos/asf/reef/repo Commit: http://git-wip-us.apache.org/repos/asf/reef/commit/ee1b6bbe Tree: http://git-wip-us.apache.org/repos/asf/reef/tree/ee1b6bbe Diff: http://git-wip-us.apache.org/repos/asf/reef/diff/ee1b6bbe Branch: refs/heads/master Commit: ee1b6bbe69c9b897192f3cc4178f4c437189afb5 Parents: 316d51e Author: Mariia Mykhailova <[email protected]> Authored: Wed Apr 6 12:48:46 2016 -0700 Committer: Markus Weimer <[email protected]> Committed: Wed Apr 6 15:54:18 2016 -0700 ---------------------------------------------------------------------- dev/appveyor-install-dependencies.ps1 | 5 ----- lang/cs/xunit.targets | 3 +++ 2 files changed, 3 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/reef/blob/ee1b6bbe/dev/appveyor-install-dependencies.ps1 ---------------------------------------------------------------------- diff --git a/dev/appveyor-install-dependencies.ps1 b/dev/appveyor-install-dependencies.ps1 index eb23090..27dbadb 100644 --- a/dev/appveyor-install-dependencies.ps1 +++ b/dev/appveyor-install-dependencies.ps1 @@ -58,8 +58,3 @@ Invoke-Expression "7z.exe x protoc.zip" | Out-Null $env:Path += ";$protocPath" Pop-Location - -# ========================== xUnit console runner -$root = (Get-Item -Path "." -Verbose).FullName -$packages = "$root\lang\cs\packages" -Invoke-Expression "nuget install .\lang\cs\.nuget\packages.config -o $packages" http://git-wip-us.apache.org/repos/asf/reef/blob/ee1b6bbe/lang/cs/xunit.targets ---------------------------------------------------------------------- diff --git a/lang/cs/xunit.targets b/lang/cs/xunit.targets index 846bed6..3abcc9f 100644 --- a/lang/cs/xunit.targets +++ b/lang/cs/xunit.targets @@ -45,6 +45,9 @@ under the License. <Error Condition="!Exists('$(PackagesDir)\xunit.core.$(xUnitVersion)\build\portable-net45+win8+wp8+wpa81\xunit.core.props')" Text="$([System.String]::Format('$(NuGetError)', '$(PackagesDir)\xunit.core.$(xUnitVersion)\build\portable-net45+win8+wp8+wpa81\xunit.core.props'))" /> <Error Condition="!Exists('$(PackagesDir)\xunit.runner.visualstudio.$(xUnitVersion)\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(NuGetError)', '$(PackagesDir)\xunit.runner.visualstudio.$(xUnitVersion)\build\net20\xunit.runner.visualstudio.props'))" /> </Target> + <Target Name="InstallXunitConsoleRunner" BeforeTargets="Test"> + <Exec Command="$(SolutionDir)\.nuget\nuget.exe restore $(SolutionDir)\.nuget\packages.config -o $(PackagesDir)" /> + </Target> <Target Name="Test"> <Exec Command="$(PackagesDir)\xunit.runner.console.$(xUnitVersion)\tools\xunit.console.exe $(OutputPath)\$(AssemblyName).dll" IgnoreStandardErrorWarningFormat="true"
