瀏覽代碼

Merge branch 'main' into dev/bartde/static_lambdas

Bart J.F. De Smet 5 年之前
父節點
當前提交
c3f8d946e4

+ 1 - 2
Rx.NET/Source/tests/Tests.System.Reactive/Tests/Disposables/DisposableTests.cs

@@ -506,7 +506,6 @@ namespace ReactiveTests.Tests
             Assert.False(enumerator.MoveNext());
         }
 
-#if NET45 || NET46 
         [Fact]
         public void CancellationDisposable_Ctor_Null()
         {
@@ -537,7 +536,7 @@ namespace ReactiveTests.Tests
             Assert.True(c.IsDisposed);
             Assert.True(c.Token.IsCancellationRequested);
         }
-#endif
+
         [Fact]
         public void ContextDisposable_CreateNullContext()
         {

+ 0 - 2
Rx.NET/Source/tests/Tests.System.Reactive/Tests/RegressionTest.cs

@@ -18,7 +18,6 @@ namespace ReactiveTests.Tests
 
     public class RegressionTest : ReactiveTest
     {
-#if NET45 || NET46
         [Fact]
         public void Bug_ConcurrentMerge()
         {
@@ -42,7 +41,6 @@ namespace ReactiveTests.Tests
 
             Assert.True(Enumerable.Range(0, reps).ToList().SequenceEqual(resultQueue.ToList()));
         }
-#endif
 
         [Fact]
         public void Bug_1283()