浏览代码

update ver

Oren Novotny 8 年之前
父节点
当前提交
ed23378294

+ 1 - 1
Rx.NET/Source/Microsoft.Reactive.Testing/Microsoft.Reactive.Testing.csproj

@@ -39,7 +39,7 @@
     </PackageReference>
     <!-- https://github.com/NuGet/Home/issues/4143 
      <PackageReference Include="xunit.assert.source" Version="2.2.0-beta4-build3444" /> -->
-    <PackageReference Include="xunit.assert" Version="2.2.0-beta4-build3465" />
+    <PackageReference Include="xunit.assert" Version="2.2.0-beta4-build3466" />
     <ProjectReference Include="..\System.Reactive\System.Reactive.csproj" />
   </ItemGroup>
 </Project>

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

@@ -76,16 +76,15 @@ Write-Host "Running tests" -Foreground Green
 $testDirectory = Join-Path $scriptPath "Tests.System.Reactive"
 
 Write-Host "Running .NET Core App 1.0 Tests" -Foreground Green
-dotnet vstest "$testDirectory\bin\$configuration\netcoreapp1.0\Tests.System.Reactive.dll" 
+#dotnet vstest "$testDirectory\bin\$configuration\netcoreapp1.0\Tests.System.Reactive.dll" 
 
 Write-Host "Running .NET 4.6 Tests" -Foreground Green
 #.\packages\xunit.runner.console\tools\xunit.console.exe "$testDirectory\bin\$configuration\net46\Tests.System.Reactive.dll" 
 
-exit
 
 # Execute OpenCover with a target of "dotnet test"
 #& $openCoverPath -register:user -oldStyle -mergeoutput -target:dotnet.exe -targetdir:"$testDirectory" -targetargs:"vstest $testDirectory\bin\$configuration\netcoreapp1.0\Tests.System.Reactive.dll --TestCaseFilter:SkipCI!=true" -output:"$outputFile" -skipautoprops -returntargetcode -excludebyattribute:"System.Diagnostics.DebuggerNonUserCodeAttribute;System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverageAttribute" -nodefaultfilters  -hideskipped:All -filter:"+[*]* -[*.Tests]* -[Tests.*]* -[xunit.*]* -[*]Xunit.*" 
-& $openCoverPath -register:user -mergeoutput -target:$xUnitConsolePath -targetdir:"$testDirectory" -targetargs:"$testDirectory\bin\$configuration\net46\Tests.System.Reactive.dll -notrait SkipCI=true" -output:"$outputFile" -skipautoprops -returntargetcode -excludebyattribute:"System.Diagnostics.DebuggerNonUserCodeAttribute;System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverageAttribute" -nodefaultfilters  -hideskipped:All -filter:"+[*]* -[*.Tests]* -[Tests.*]* -[xunit.*]* -[*]Xunit.*" 
+& $openCoverPath -register:user -oldStyle -mergeoutput -target:$xUnitConsolePath -targetdir:"$testDirectory" -targetargs:"$testDirectory\bin\$configuration\net46\Tests.System.Reactive.dll -notrait SkipCI=true" -output:"$outputFile" -skipautoprops -returntargetcode -excludebyattribute:"System.Diagnostics.DebuggerNonUserCodeAttribute;System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverageAttribute" -nodefaultfilters  -hideskipped:All -filter:"+[*]* -[*.Tests]* -[Tests.*]* -[xunit.*]* -[*]Xunit.*" 
 
 if ($LastExitCode -ne 0) { 
     Write-Host "Error with tests" -Foreground Red