R3 more package

Cysharp · Jan 8, 2024 · 24ff674 · 24ff674
1 parent 4d3cff8
commit 24ff674
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/src/R3.Avalonia/AvaloniaDispatcherFrameProvider.cs b/src/R3.Avalonia/AvaloniaDispatcherFrameProvider.cs
@@ -102,14 +102,14 @@ void Run(object? sender, EventArgs e)
         }
     }
 
-    static void ThrowObjectDisposedIf([DoesNotReturnIf(true)] bool condition, Type type)
+    static void ThrowObjectDisposedIf(/*[DoesNotReturnIf(true)]*/ bool condition, Type type)
     {
         if (condition)
         {
             ThrowObjectDisposedException(type);
         }
     }
 
-    [DoesNotReturn]
+    // [DoesNotReturn]
     internal static void ThrowObjectDisposedException(Type? type) => throw new ObjectDisposedException(type?.FullName);
 }
diff --git a/src/R3.Avalonia/R3.Avalonia.csproj b/src/R3.Avalonia/R3.Avalonia.csproj
@@ -1,10 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net8.0</TargetFrameworks>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
-
+        <LangVersion>12</LangVersion>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <NoWarn>1701;1702;1591;1573</NoWarn>
 

diff --git a/src/R3.WPF/R3.WPF.csproj b/src/R3.WPF/R3.WPF.csproj
@@ -1,9 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net8.0-windows;</TargetFrameworks>
+        <TargetFrameworks>net6.0-windows;net7.0-windows;net8.0-windows;net472;</TargetFrameworks>
         <Nullable>enable</Nullable>
         <UseWPF>true</UseWPF>
+        <LangVersion>12</LangVersion>
         <ImplicitUsings>enable</ImplicitUsings>
         <EnableWindowsTargeting>true</EnableWindowsTargeting>
 

diff --git a/src/R3.WPF/WpfRenderingFrameProvider.cs b/src/R3.WPF/WpfRenderingFrameProvider.cs
@@ -68,14 +68,14 @@ void Run(object? sender, EventArgs e)
         }
     }
 
-    static void ThrowObjectDisposedIf([DoesNotReturnIf(true)] bool condition, Type type)
+    static void ThrowObjectDisposedIf(/*[DoesNotReturnIf(true)]*/ bool condition, Type type)
     {
         if (condition)
         {
             ThrowObjectDisposedException(type);
         }
     }
 
-    [DoesNotReturn]
+    // [DoesNotReturn]
     internal static void ThrowObjectDisposedException(Type? type) => throw new ObjectDisposedException(type?.FullName);
 }
diff --git a/src/R3/ObservableSystem.cs b/src/R3/ObservableSystem.cs
@@ -1,6 +1,6 @@
 namespace R3;
 
-public class ObservableSystem
+public static class ObservableSystem
 {
     public static TimeProvider DefaultTimeProvider { get; set; } = TimeProvider.System;
     public static FrameProvider DefaultFrameProvider { get; set; } = new NotSupportedFrameProvider();