diff --git a/Rx.NET/Source/Directory.build.props b/Rx.NET/Source/Directory.build.props
index f84baa2cb..505b9863f 100644
--- a/Rx.NET/Source/Directory.build.props
+++ b/Rx.NET/Source/Directory.build.props
@@ -39,7 +39,7 @@
-->
diff --git a/Rx.NET/Source/benchmarks/Benchmarks.System.Reactive/Benchmarks.System.Reactive.csproj b/Rx.NET/Source/benchmarks/Benchmarks.System.Reactive/Benchmarks.System.Reactive.csproj
index 1f045a204..d7b79a1de 100644
--- a/Rx.NET/Source/benchmarks/Benchmarks.System.Reactive/Benchmarks.System.Reactive.csproj
+++ b/Rx.NET/Source/benchmarks/Benchmarks.System.Reactive/Benchmarks.System.Reactive.csproj
@@ -37,10 +37,10 @@
-
-
-
-
+
+
+
+
diff --git a/Rx.NET/Source/tests/Tests.System.Reactive.ApiApprovals/Api/ApiApprovalTests.Aliases.verified.cs b/Rx.NET/Source/tests/Tests.System.Reactive.ApiApprovals/Api/ApiApprovalTests.Aliases.verified.cs
index d7a2e3a97..855b20a9b 100644
--- a/Rx.NET/Source/tests/Tests.System.Reactive.ApiApprovals/Api/ApiApprovalTests.Aliases.verified.cs
+++ b/Rx.NET/Source/tests/Tests.System.Reactive.ApiApprovals/Api/ApiApprovalTests.Aliases.verified.cs
@@ -1,4 +1,4 @@
-[assembly: System.CLSCompliant(true)]
+[assembly: System.CLSCompliant(true)]
[assembly: System.Resources.NeutralResourcesLanguage("en-US")]
[assembly: System.Runtime.InteropServices.ComVisible(false)]
[assembly: System.Runtime.Versioning.TargetFramework(".NETFramework,Version=v4.7.2", FrameworkDisplayName=".NET Framework 4.7.2")]
@@ -13,20 +13,20 @@ public static System.Reactive.Linq.IQbservable FlatMap(
public static System.Reactive.Linq.IQbservable FlatMap(this System.Reactive.Linq.IQbservable source, System.Linq.Expressions.Expression>> selector) { }
public static System.Reactive.Linq.IQbservable FlatMap(this System.Reactive.Linq.IQbservable source, System.Linq.Expressions.Expression>> selector) { }
public static System.Reactive.Linq.IQbservable FlatMap(this System.Reactive.Linq.IQbservable source, System.Linq.Expressions.Expression>> selector) { }
+ public static System.Reactive.Linq.IQbservable FlatMap(this System.Reactive.Linq.IQbservable source, System.Linq.Expressions.Expression>> selector) { }
public static System.Reactive.Linq.IQbservable FlatMap(this System.Reactive.Linq.IQbservable source, System.Linq.Expressions.Expression>> selector) { }
public static System.Reactive.Linq.IQbservable FlatMap(this System.Reactive.Linq.IQbservable source, System.Linq.Expressions.Expression>> selector) { }
public static System.Reactive.Linq.IQbservable FlatMap(this System.Reactive.Linq.IQbservable source, System.Linq.Expressions.Expression>> selector) { }
- public static System.Reactive.Linq.IQbservable FlatMap(this System.Reactive.Linq.IQbservable source, System.Linq.Expressions.Expression>> selector) { }
public static System.Reactive.Linq.IQbservable FlatMap(this System.Reactive.Linq.IQbservable source, System.Linq.Expressions.Expression>> selector) { }
public static System.Reactive.Linq.IQbservable FlatMap(this System.Reactive.Linq.IQbservable source, System.Linq.Expressions.Expression>> onNext, System.Linq.Expressions.Expression>> onError, System.Linq.Expressions.Expression>> onCompleted) { }
public static System.Reactive.Linq.IQbservable FlatMap(this System.Reactive.Linq.IQbservable source, System.Linq.Expressions.Expression>> onNext, System.Linq.Expressions.Expression>> onError, System.Linq.Expressions.Expression>> onCompleted) { }
public static System.Reactive.Linq.IQbservable FlatMap(this System.Reactive.Linq.IQbservable source, System.Linq.Expressions.Expression>> collectionSelector, System.Linq.Expressions.Expression> resultSelector) { }
public static System.Reactive.Linq.IQbservable FlatMap(this System.Reactive.Linq.IQbservable source, System.Linq.Expressions.Expression>> collectionSelector, System.Linq.Expressions.Expression> resultSelector) { }
public static System.Reactive.Linq.IQbservable FlatMap(this System.Reactive.Linq.IQbservable source, System.Linq.Expressions.Expression>> taskSelector, System.Linq.Expressions.Expression> resultSelector) { }
+ public static System.Reactive.Linq.IQbservable FlatMap(this System.Reactive.Linq.IQbservable source, System.Linq.Expressions.Expression>> taskSelector, System.Linq.Expressions.Expression> resultSelector) { }
public static System.Reactive.Linq.IQbservable FlatMap(this System.Reactive.Linq.IQbservable source, System.Linq.Expressions.Expression>> collectionSelector, System.Linq.Expressions.Expression> resultSelector) { }
public static System.Reactive.Linq.IQbservable FlatMap(this System.Reactive.Linq.IQbservable source, System.Linq.Expressions.Expression>> collectionSelector, System.Linq.Expressions.Expression> resultSelector) { }
public static System.Reactive.Linq.IQbservable FlatMap(this System.Reactive.Linq.IQbservable source, System.Linq.Expressions.Expression>> taskSelector, System.Linq.Expressions.Expression> resultSelector) { }
- public static System.Reactive.Linq.IQbservable FlatMap(this System.Reactive.Linq.IQbservable source, System.Linq.Expressions.Expression>> taskSelector, System.Linq.Expressions.Expression> resultSelector) { }
public static System.Reactive.Linq.IQbservable FlatMap(this System.Reactive.Linq.IQbservable source, System.Linq.Expressions.Expression>> taskSelector, System.Linq.Expressions.Expression> resultSelector) { }
public static System.Reactive.Linq.IQbservable Map(this System.Reactive.Linq.IQbservable source, System.Linq.Expressions.Expression> selector) { }
public static System.Reactive.Linq.IQbservable Map(this System.Reactive.Linq.IQbservable source, System.Linq.Expressions.Expression> selector) { }
@@ -41,10 +41,10 @@ public static System.IObservable Filter(this System.IObservabl
public static System.IObservable FlatMap(this System.IObservable source, System.Func> selector) { }
public static System.IObservable FlatMap(this System.IObservable source, System.Func> selector) { }
public static System.IObservable FlatMap(this System.IObservable source, System.Func> selector) { }
+ public static System.IObservable FlatMap(this System.IObservable source, System.Func> selector) { }
public static System.IObservable FlatMap(this System.IObservable source, System.Func> selector) { }
public static System.IObservable FlatMap(this System.IObservable source, System.Func> selector) { }
public static System.IObservable FlatMap(this System.IObservable source, System.Func> selector) { }
- public static System.IObservable FlatMap(this System.IObservable source, System.Func> selector) { }
public static System.IObservable FlatMap(this System.IObservable source, System.Func> selector) { }
public static System.IObservable FlatMap(this System.IObservable source, System.IObservable other) { }
public static System.IObservable FlatMap(this System.IObservable source, System.Func> onNext, System.Func> onError, System.Func> onCompleted) { }
@@ -52,12 +52,12 @@ public static System.IObservable FlatMap(this System.
public static System.IObservable FlatMap(this System.IObservable source, System.Func> collectionSelector, System.Func resultSelector) { }
public static System.IObservable FlatMap(this System.IObservable source, System.Func> collectionSelector, System.Func resultSelector) { }
public static System.IObservable FlatMap(this System.IObservable source, System.Func> taskSelector, System.Func resultSelector) { }
+ public static System.IObservable FlatMap(this System.IObservable source, System.Func> taskSelector, System.Func resultSelector) { }
public static System.IObservable FlatMap(this System.IObservable source, System.Func> collectionSelector, System.Func resultSelector) { }
public static System.IObservable FlatMap(this System.IObservable source, System.Func> collectionSelector, System.Func resultSelector) { }
public static System.IObservable FlatMap(this System.IObservable source, System.Func> taskSelector, System.Func resultSelector) { }
- public static System.IObservable FlatMap(this System.IObservable source, System.Func> taskSelector, System.Func resultSelector) { }
public static System.IObservable FlatMap(this System.IObservable source, System.Func> taskSelector, System.Func resultSelector) { }
public static System.IObservable Map(this System.IObservable source, System.Func selector) { }
public static System.IObservable Map(this System.IObservable source, System.Func selector) { }
}
-}
\ No newline at end of file
+}
diff --git a/Rx.NET/Source/tests/Tests.System.Reactive.ApiApprovals/Api/ApiApprovalTests.Core.verified.cs b/Rx.NET/Source/tests/Tests.System.Reactive.ApiApprovals/Api/ApiApprovalTests.Core.verified.cs
index a63670796..0f771c77c 100644
--- a/Rx.NET/Source/tests/Tests.System.Reactive.ApiApprovals/Api/ApiApprovalTests.Core.verified.cs
+++ b/Rx.NET/Source/tests/Tests.System.Reactive.ApiApprovals/Api/ApiApprovalTests.Core.verified.cs
@@ -163,9 +163,9 @@ public static System.IObserver Create(System.Action onNext, System.Acti
public static System.IObserver NotifyOn(this System.IObserver observer, System.Reactive.Concurrency.IScheduler scheduler) { }
public static System.IObserver NotifyOn(this System.IObserver observer, System.Threading.SynchronizationContext context) { }
public static System.IObserver Synchronize(System.IObserver observer) { }
+ public static System.IObserver Synchronize(System.IObserver observer, System.Reactive.Concurrency.AsyncLock asyncLock) { }
public static System.IObserver Synchronize(System.IObserver observer, bool preventReentrancy) { }
public static System.IObserver Synchronize(System.IObserver observer, object gate) { }
- public static System.IObserver Synchronize(System.IObserver observer, System.Reactive.Concurrency.AsyncLock asyncLock) { }
public static System.Action> ToNotifier(this System.IObserver observer) { }
public static System.IObserver ToObserver(this System.Action> handler) { }
public static System.IObserver ToObserver(this System.IProgress progress) { }
@@ -517,7 +517,7 @@ public abstract class VirtualTimeSchedulerBase : System.IS
{
protected VirtualTimeSchedulerBase() { }
protected VirtualTimeSchedulerBase(TAbsolute initialClock, System.Collections.Generic.IComparer comparer) { }
- public TAbsolute Clock { get; set; }
+ public TAbsolute Clock { get; protected set; }
protected System.Collections.Generic.IComparer Comparer { get; }
public bool IsEnabled { get; }
public System.DateTimeOffset Now { get; }
@@ -886,8 +886,8 @@ public static System.IObservable Aggregate(this System.IObserv
public static System.IObservable Aggregate(this System.IObservable source, TAccumulate seed, System.Func accumulator) { }
public static System.IObservable Aggregate(this System.IObservable source, TAccumulate seed, System.Func accumulator, System.Func resultSelector) { }
public static System.IObservable All