Adds support for threading lock in .NET 9 and C# 13

src/R3.Avalonia/AvaloniaDispatcherFrameProvider.cs

@@ -13,7 +13,11 @@ public sealed class AvaloniaDispatcherFrameProvider : FrameProvider, IDisposable
     bool disposed;
     long frameCount;
     FreeListCore<IFrameRunnerWorkItem> list;
+#if NET9_0_OR_GREATER
+    readonly System.Threading.Lock gate = new();
+#else
     readonly object gate = new object();
+#endif
     readonly DispatcherTimer timer;
     EventHandler timerTick;
 

src/R3.Avalonia/AvaloniaRenderingFrameProvider.cs

@@ -10,7 +10,11 @@ public class AvaloniaRenderingFrameProvider : FrameProvider, IDisposable
     bool disposed;
     long frameCount;
     FreeListCore<IFrameRunnerWorkItem> list;
+#if NET9_0_OR_GREATER
+    readonly System.Threading.Lock gate = new();
+#else
     readonly object gate = new object();
+#endif
 
     Action<TimeSpan> messageLoop;
 

src/R3.Avalonia/ObserveOnExtensions.cs

@@ -40,7 +40,12 @@ sealed class _ObserveOnDispatcher : Observer<T>
         readonly Observer<T> observer;
         readonly Dispatcher dispatcher;
         readonly DispatcherPriority? dispatcherPriority;
+#if NET9_0_OR_GREATER
+        readonly System.Threading.Lock gate = new();
+#else
         readonly object gate = new object();
+#endif
+
         SwapListCore<Notification<T>> list;
         bool running;
 

src/R3.Avalonia/R3.Avalonia.csproj

@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net8.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net8.0;net9.0;netstandard2.0;netstandard2.1</TargetFrameworks>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
-        <LangVersion>12</LangVersion>
+        <LangVersion>13</LangVersion>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <NoWarn>1701;1702;1591;1573</NoWarn>
 

src/R3.Blazor/R3.Blazor.csproj

@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
         <OutputType>Library</OutputType>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
-        <LangVersion>12</LangVersion>
+        <LangVersion>13</LangVersion>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <NoWarn>1701;1702;1591;1573</NoWarn>
         <RootNamespace>R3</RootNamespace>

src/R3.BlazorWebAssembly/R3.BlazorWebAssembly.csproj

@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
         <OutputType>Library</OutputType>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
-        <LangVersion>12</LangVersion>
+        <LangVersion>13</LangVersion>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <NoWarn>1701;1702;1591;1573</NoWarn>
         <RootNamespace>R3</RootNamespace>

src/R3.Godot/addons/R3.Godot/GodotFrameProvider.cs

@@ -19,7 +19,11 @@ public class GodotFrameProvider : FrameProvider
     public static readonly GodotFrameProvider PhysicsProcess = new GodotFrameProvider(PlayerLoopTiming.PhysicsProcess);
 
     FreeListCore<IFrameRunnerWorkItem> list;
+#if NET9_0_OR_GREATER
+    readonly System.Threading.Lock gate = new();
+#else
     readonly object gate = new object();
+#endif
 
     PlayerLoopTiming PlayerLoopTiming { get; }
 

src/R3.Godot/addons/R3.Godot/GodotTimeProvider.cs

@@ -44,7 +44,11 @@ enum RunningState
     readonly TimerCallback callback;
     readonly object? state;
     readonly GodotFrameProvider frameProvider;
+#if NET9_0_OR_GREATER
+    readonly System.Threading.Lock gate = new();
+#else
     readonly object gate = new object();
+#endif
 
     TimeSpan dueTime;
     TimeSpan period;

src/R3.LogicLooper/LogicLooperFrameProvider.cs

@@ -13,7 +13,11 @@ public sealed class LogicLooperFrameProvider : FrameProvider, IDisposable
     Task loop;
     internal long timestamp;
     internal TimeSpan deltaTime;
+#if NET9_0_OR_GREATER
+    readonly System.Threading.Lock gate = new();
+#else
     readonly object gate = new object();
+#endif
 
     public LogicLooperFrameProvider(ILogicLooper looper)
     {

src/R3.LogicLooper/LogicLooperTimerProvider.cs

@@ -28,7 +28,11 @@ enum RunningState
     readonly TimerCallback callback;
     readonly object? state;
     readonly LogicLooperFrameProvider frameProvider;
+#if NET9_0_OR_GREATER
+    readonly System.Threading.Lock gate = new();
+#else
     readonly object gate = new object();
+#endif
 
     TimeSpan dueTime;
     TimeSpan period;

src/R3.LogicLooper/R3.LogicLooper.csproj

@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net8.0</TargetFrameworks>
+        <TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net8.0;net9.0</TargetFrameworks>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
-        <LangVersion>12</LangVersion>
+        <LangVersion>13</LangVersion>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <NoWarn>1701;1702;1591;1573</NoWarn>
 

src/R3.Maui/MauiTickerFrameProvider.cs

@@ -6,7 +6,11 @@ namespace R3;
 public class MauiTickerFrameProvider : FrameProvider, IDisposable
 {
     readonly ITicker ticker;
+#if NET9_0_OR_GREATER
+    readonly System.Threading.Lock gate = new();
+#else
     readonly object gate = new();
+#endif
     readonly Action timerTick;
 
     FreeListCore<IFrameRunnerWorkItem> runners;

src/R3.Maui/ObserveOnExtensions.cs

@@ -43,7 +43,11 @@ sealed class _ObserveOnDispatcher : Observer<T>
         readonly Action postCallback;
         readonly Observer<T> observer;
         readonly IDispatcher dispatcher;
-        readonly object gate = new();
+#if NET9_0_OR_GREATER
+    readonly System.Threading.Lock gate = new();
+#else
+    readonly object gate = new();
+#endif
         SwapListCore<Notification<T>> list;
         bool running;
 

src/R3.Maui/R3.Maui.csproj

@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net8.0</TargetFrameworks>
+        <TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net8.0;net9.0</TargetFrameworks>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
-        <LangVersion>12</LangVersion>
+        <LangVersion>13</LangVersion>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <NoWarn>1701;1702;1591;1573</NoWarn>
 

src/R3.MonoGame/MonoGameFrameProvider.cs

@@ -7,7 +7,11 @@ public class MonoGameFrameProvider : FrameProvider
 {
     public static readonly MonoGameFrameProvider Update = new();
 
+#if NET9_0_OR_GREATER
+    readonly System.Threading.Lock gate = new();
+#else
     readonly object gate = new();
+#endif
     FreeListCore<IFrameRunnerWorkItem> list;
     long frameCount;
     bool disposed;

src/R3.MonoGame/MonoGameTimeProvider.cs

@@ -13,7 +13,11 @@ public class MonoGameTimeProvider : TimeProvider, IDisposable
     public GameTime GameTime { get; private set; } = new();
 
     FreeListCore<FrameTimer> list;
+#if NET9_0_OR_GREATER
+    readonly System.Threading.Lock gate = new();
+#else
     readonly object gate = new();
+#endif
 
     // frame loop is delayed until first register
     bool running;
@@ -110,7 +114,11 @@ enum RunningState
     readonly MonoGameTimeProvider timeProvider;
     readonly TimerCallback callback;
     readonly object? state;
+#if NET9_0_OR_GREATER
+    readonly System.Threading.Lock gate = new();
+#else
     readonly object gate = new();
+#endif
 
     TimeSpan dueTime;
     TimeSpan period;
@@ -254,4 +262,3 @@ public ValueTask DisposeAsync()
         return default;
     }
 }
-

src/R3.MonoGame/R3.MonoGame.csproj

@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+        <TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
         <Nullable>enable</Nullable>
-        <LangVersion>12</LangVersion>
+        <LangVersion>13</LangVersion>
 
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <NoWarn>1701;1702;1591;1573</NoWarn>

src/R3.Stride/R3.Stride.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net8.0</TargetFrameworks>
+        <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
         <Nullable>enable</Nullable>
         <PackageReadmeFile>README.md</PackageReadmeFile>
 

src/R3.Stride/StrideFrameProvider.cs

@@ -8,7 +8,11 @@ namespace R3;
 public sealed class StrideFrameProvider : FrameProvider
 {
     FreeListCore<IFrameRunnerWorkItem> list;
+#if NET9_0_OR_GREATER
+    readonly System.Threading.Lock gate = new();
+#else
     readonly object gate = new object();
+#endif
 
     internal StrongBox<double> Delta = default!; // set from Node before running process.
 

src/R3.Stride/StrideTimeProvider.cs

@@ -39,7 +39,11 @@ enum RunningState
     TimeSpan period;
     bool isDisposed;
     readonly StrideFrameProvider frameProvider;
+#if NET9_0_OR_GREATER
+    readonly System.Threading.Lock gate = new();
+#else
     readonly object gate = new object();
+#endif
     RunningState runningState;
     double elapsed;
 

src/R3.WPF/ObserveOnExtensions.cs

@@ -40,7 +40,12 @@ sealed class _ObserveOnDispatcher : Observer<T>
         readonly Observer<T> observer;
         readonly Dispatcher dispatcher;
         readonly DispatcherPriority dispatcherPriority;
+#if NET9_0_OR_GREATER
+        readonly System.Threading.Lock gate = new();
+#else
         readonly object gate = new object();
+#endif
+
         SwapListCore<Notification<T>> list;
         bool running;
 

src/R3.WPF/R3.WPF.csproj

@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net6.0-windows;net7.0-windows;net8.0-windows;net472;</TargetFrameworks>
+        <TargetFrameworks>net6.0-windows;net7.0-windows;net8.0-windows;net9.0-windows;net472;</TargetFrameworks>
         <Nullable>enable</Nullable>
         <UseWPF>true</UseWPF>
-        <LangVersion>12</LangVersion>
+        <LangVersion>13</LangVersion>
         <ImplicitUsings>enable</ImplicitUsings>
         <EnableWindowsTargeting>true</EnableWindowsTargeting>
 

src/R3.WPF/WpfRenderingFrameProvider.cs

@@ -1,4 +1,4 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using R3.Collections;
 
 namespace R3;
@@ -8,7 +8,11 @@ public sealed class WpfRenderingFrameProvider : FrameProvider, IDisposable
     bool disposed;
     long frameCount;
     FreeListCore<IFrameRunnerWorkItem> list;
+#if NET9_0_OR_GREATER
+    readonly System.Threading.Lock gate = new();
+#else
     readonly object gate = new object();
+#endif
 
     EventHandler messageLoop;
 

src/R3.WinForms/R3.WinForms.csproj

@@ -1,9 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net6.0-windows;net8.0-windows;net472</TargetFrameworks>
+        <TargetFrameworks>net6.0-windows;net8.0-windows;net9.0-windows;net472</TargetFrameworks>
         <UseWindowsForms>true</UseWindowsForms>
-        <LangVersion>12</LangVersion>
+        <LangVersion>13</LangVersion>
         <ImplicitUsings>disable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <EnableWindowsTargeting>true</EnableWindowsTargeting>
@@ -16,7 +16,7 @@
     <ItemGroup>
         <None Include="../../Icon.png" Pack="true" PackagePath="/" />
     </ItemGroup>
-    
+
     <ItemGroup>
         <ProjectReference Include="..\R3\R3.csproj" />
     </ItemGroup>

src/R3.WinForms/WinFormsFrameProvider.cs

@@ -14,7 +14,11 @@ public sealed class WinFormsFrameProvider :
     private bool disposed;
     private long frameCount;
     private FreeListCore<IFrameRunnerWorkItem> list;
+#if NET9_0_OR_GREATER
+    private readonly System.Threading.Lock gate = new();
+#else
     private readonly object gate = new object();
+#endif
     private readonly MessageHook filter;
     private readonly MessageFilter? predicate;
 

src/R3.WinUI3/WinUI3RenderingFrameProvider.cs

@@ -9,7 +9,11 @@ public sealed class WinUI3RenderingFrameProvider : FrameProvider, IDisposable
     bool disposed;
     long frameCount;
     FreeListCore<IFrameRunnerWorkItem> list;
+#if NET9_0_OR_GREATER
+    readonly System.Threading.Lock gate = new();
+#else
     readonly object gate = new object();
+#endif
 
     EventHandler<object> messageLoop;
 

src/R3/AwaitOperation.cs

@@ -188,7 +188,11 @@ internal abstract class AwaitOperationSwitchObserver<T> : Observer<T>
     CancellationTokenSource cancellationTokenSource;
     readonly bool configureAwait; // continueOnCapturedContext
     readonly bool cancelOnCompleted;
+#if NET9_0_OR_GREATER
+    protected readonly System.Threading.Lock gate = new();
+#else
     protected readonly object gate = new object();
+#endif
     bool running;
     bool completed;
 
@@ -292,7 +296,11 @@ internal abstract class AwaitOperationParallelObserver<T> : Observer<T>
     readonly CancellationTokenSource cancellationTokenSource;
     readonly bool configureAwait; // continueOnCapturedContext
     readonly bool cancelOnCompleted;
+#if NET9_0_OR_GREATER
+    protected readonly System.Threading.Lock gate = new(); // need to use gate.
+#else
     protected readonly object gate = new object(); // need to use gate.
+#endif
 
     protected sealed override bool AutoDisposeOnCompleted => false; // disable auto-dispose
     int runningCount = 0;
@@ -459,7 +467,11 @@ async void RunQueueWorker() // don't(can't) wait so use async void
 internal abstract class AwaitOperationParallelConcurrentLimitObserver<T>(bool configureAwait, bool cancelOnCompleted, int maxConcurrent) : Observer<T>
 {
     readonly CancellationTokenSource cancellationTokenSource = new();
+#if NET9_0_OR_GREATER
+    protected readonly System.Threading.Lock gate = new(); // need to use gate.
+#else
     protected readonly object gate = new object(); // need to use gate.
+#endif
 
     protected sealed override bool AutoDisposeOnCompleted => false; // disable auto-dispose
 
@@ -555,7 +567,11 @@ internal abstract class AwaitOperationSequentialParallelConcurrentLimitObserver<
     readonly bool configureAwait; // continueOnCapturedContext
     readonly bool cancelOnCompleted;
     readonly int maxConcurrent;
+    #if NET9_0_OR_GREATER
+    readonly System.Threading.Lock gate = new();
+#else
     readonly object gate = new object();
+#endif
     readonly Channel<(T, ValueTask<TTaskValue>)> channel;
     bool completed;
     int runningCount;