Release v9.3.1 (#437)

* Update dotnet-core-unit-testing.yml * ReactivePropertyWpfScheduler throws StackOverflowException. (#436) * dispatch to ImmediateScheduler * Incrment version number * Update dotnet-core-unit-testing.yml
runceel · Aug 11, 2023 · ba99109 · ba99109
1 parent a9cb8ff
commit ba99109
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 51 deletions.
diff --git a/Source/Directory.Build.props b/Source/Directory.Build.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <RootNamespace>Reactive.Bindings</RootNamespace>
-    <Version>9.3.0</Version>
+    <Version>9.3.1</Version>
     <Authors>neuecc xin9le okazuki</Authors>
     <PackageProjectUrl>https://github.com/runceel/ReactiveProperty</PackageProjectUrl>
     <PackageTags>rx mvvm async rx-main reactive</PackageTags>

diff --git a/Source/ReactiveProperty.Platform.WPF/Schedulers/ReactivePropertyWpfScheduler.cs b/Source/ReactiveProperty.Platform.WPF/Schedulers/ReactivePropertyWpfScheduler.cs
@@ -12,7 +12,6 @@ namespace Reactive.Bindings.Schedulers;
 public class ReactivePropertyWpfScheduler : LocalScheduler
 {
     private readonly Dispatcher _dispatcher;
-    private readonly DispatcherSynchronizationContext _context;
 
     /// <summary>
     /// Construct a scheduler from Dispatcher.
@@ -21,7 +20,6 @@ public class ReactivePropertyWpfScheduler : LocalScheduler
     public ReactivePropertyWpfScheduler(Dispatcher dispatcher)
     {
         _dispatcher = dispatcher;
-        _context = new DispatcherSynchronizationContext(dispatcher);
     }
 
     /// <summary>
@@ -40,18 +38,19 @@ public override IDisposable Schedule<TState>(TState state, Func<IScheduler, TSta
 
         if (_dispatcher.CheckAccess())
         {
-            return action(this, state);
+            return ImmediateScheduler.Instance.Schedule(state, action);
         }
 
         var d = new SingleAssignmentDisposable();
 
-        _context.PostWithStartComplete(() =>
-        {
-            if (!d.IsDisposed)
+        _dispatcher.BeginInvoke(() =>
             {
-                d.Disposable = action(this, state);
-            }
-        });
+                if (!d.IsDisposed)
+                {
+                    d.Disposable = action(this, state);
+                }
+            }, 
+            DispatcherPriority.Normal);
 
         return d;
     }
@@ -80,46 +79,5 @@ public override IDisposable Schedule<TState>(TState state, TimeSpan dueTime, Fun
         // Note that avoiding closure allocation here would introduce infinite generic recursion over the TState argument
         return DefaultScheduler.Instance.Schedule(state, dt, (_, state1) => Schedule(state1, action));
     }
-}
-internal static class SynchronizationContextExtensions
-{
-    public static void PostWithStartComplete<T>(this SynchronizationContext context, Action<T> action, T state)
-    {
-        context.OperationStarted();
 
-        context.Post(
-            o =>
-            {
-                try
-                {
-                    action((T)o!);
-                }
-                finally
-                {
-                    context.OperationCompleted();
-                }
-            },
-            state
-        );
-    }
-
-    public static void PostWithStartComplete(this SynchronizationContext context, Action action)
-    {
-        context.OperationStarted();
-
-        context.Post(
-            _ =>
-            {
-                try
-                {
-                    action();
-                }
-                finally
-                {
-                    context.OperationCompleted();
-                }
-            },
-            null
-        );
-    }
 }