Browse Source

update xunit runner to version with vsts reporter (#608)

* update xunit runner to version with vsts reporter

* use dotnet test
Oren Novotny 7 years ago
parent
commit
c66d7caed4

+ 1 - 3
Rx.NET/Source/build-new.ps1

@@ -5,7 +5,6 @@ $configuration = $Env:BuildConfiguration
 $isCloudBuild = Test-Path -Path env:\TF_BUILD
 $outputLocation = Join-Path $scriptPath "testResults"
 $openCoverPath = ".\packages\OpenCover\tools\OpenCover.Console.exe"
-$xUnitConsolePath = ".\packages\xunit.runner.console\tools\net452\xunit.console.exe"
 $rootPath = (Resolve-Path .).Path
 $artifacts = Join-Path $rootPath "artifacts"
 
@@ -28,7 +27,6 @@ if (!(Test-Path .\nuget.exe)) {
 .\nuget.exe install -excludeversion SignClient -Version 0.9.1 -outputdirectory packages
 .\nuget.exe install -excludeversion JetBrains.dotCover.CommandLineTools -version 2017.3.5 -outputdirectory packages
 .\nuget.exe install -excludeversion Nerdbank.GitVersioning -Version 2.1.23 -outputdirectory packages
-.\nuget.exe install -excludeversion xunit.runner.console -outputdirectory packages
 #.\nuget.exe install -excludeversion OpenCover -Version 4.6.519 -outputdirectory packages
 .\nuget.exe install -excludeversion ReportGenerator -outputdirectory packages
 #.\nuget.exe install -excludeversion coveralls.io -outputdirectory packages
@@ -97,7 +95,7 @@ if ($LastExitCode -ne 0) {
 	}  
 }
 
-.\packages\xunit.runner.console\tools\net452\xunit.console.exe tests\Tests.System.Reactive.ApiApprovals\bin\$configuration\net46\Tests.System.Reactive.ApiApprovals.dll
+& dotnet test tests\Tests.System.Reactive.ApiApprovals\Tests.System.Reactive.ApiApprovals.csproj -c $configuration --no-build --no-restore 
 
 if ($LastExitCode -ne 0) { 
 	Write-Host "Error with API approval tests" -Foreground Red

+ 3 - 4
Rx.NET/Source/tests/Tests.System.Reactive.ApiApprovals/Tests.System.Reactive.ApiApprovals.csproj

@@ -21,10 +21,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
-    <PackageReference Include="xunit" Version="2.3.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
-    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
+    <PackageReference Include="xunit" Version="2.4.0-beta.2.build4010" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0-beta.2.build4010" />
     <PackageReference Include="ApprovalTests" Version="3.0.14" />
     <PackageReference Include="PublicApiGenerator" Version="7.0.1" />
   </ItemGroup>