Add net8.0 target.

StephenCleary · Dec 3, 2023 · 61b8102 · 61b8102
1 parent 34bfaed
commit 61b8102
Show file tree

Hide file tree

Showing 17 changed files with 28 additions and 22 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,6 @@
+root = true
+
+[*.cs]
+dotnet_diagnostic.CA1008.severity = none # Use None for flags enum value of 0
+dotnet_diagnostic.CA1513.severity = none # Use ObjectDisposedException.ThrowIf
+dotnet_diagnostic.CA1711.severity = none # Don't name enum with Flags suffix
diff --git a/src/Nito.Disposables/AnonymousAsyncDisposable.cs b/src/Nito.Disposables/AnonymousAsyncDisposable.cs
@@ -1,4 +1,4 @@
-#if NETSTANDARD2_1
+#if !NETSTANDARD1_0 && !NETSTANDARD2_0 && !NET461
 using System;
 using System.Collections.Generic;
 using System.Linq;

diff --git a/src/Nito.Disposables/AsyncDisposable.cs b/src/Nito.Disposables/AsyncDisposable.cs
@@ -1,4 +1,4 @@
-#if NETSTANDARD2_1
+#if !NETSTANDARD1_0 && !NETSTANDARD2_0 && !NET461
 using System;
 using System.Collections.Generic;
 using System.Linq;

diff --git a/src/Nito.Disposables/AsyncDisposeFlags.cs b/src/Nito.Disposables/AsyncDisposeFlags.cs
@@ -1,4 +1,4 @@
-#if NETSTANDARD2_1
+#if !NETSTANDARD1_0 && !NETSTANDARD2_0 && !NET461
 using System;
 using System.Collections.Generic;
 using System.Text;

diff --git a/src/Nito.Disposables/CollectionAsyncDisposable.cs b/src/Nito.Disposables/CollectionAsyncDisposable.cs
@@ -1,4 +1,4 @@
-#if NETSTANDARD2_1
+#if !NETSTANDARD1_0 && !NETSTANDARD2_0 && !NET461
 using System;
 using System.Collections.Generic;
 using System.Collections.Immutable;

diff --git a/src/Nito.Disposables/DisposableExtensions.cs b/src/Nito.Disposables/DisposableExtensions.cs
@@ -1,4 +1,4 @@
-#if NETSTANDARD2_1
+#if !NETSTANDARD1_0 && !NETSTANDARD2_0 && !NET461
 using System;
 using System.Collections.Generic;
 using System.Text;

diff --git a/src/Nito.Disposables/IReferenceCountedAsyncDisposable.cs b/src/Nito.Disposables/IReferenceCountedAsyncDisposable.cs
@@ -1,4 +1,4 @@
-#if NETSTANDARD2_1
+#if !NETSTANDARD1_0 && !NETSTANDARD2_0 && !NET461
 using System;
 
 namespace Nito.Disposables;

diff --git a/src/Nito.Disposables/IWeakReferenceCountedAsyncDisposable.cs b/src/Nito.Disposables/IWeakReferenceCountedAsyncDisposable.cs
@@ -1,4 +1,4 @@
-#if NETSTANDARD2_1
+#if !NETSTANDARD1_0 && !NETSTANDARD2_0 && !NET461
 using System;
 
 namespace Nito.Disposables;

diff --git a/src/Nito.Disposables/Internals/BoundAsyncAction.cs b/src/Nito.Disposables/Internals/BoundAsyncAction.cs
@@ -1,4 +1,4 @@
-#if NETSTANDARD2_1
+#if !NETSTANDARD1_0 && !NETSTANDARD2_0 && !NET461
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;

diff --git a/src/Nito.Disposables/Internals/ReferenceCountedAsyncDisposable.cs b/src/Nito.Disposables/Internals/ReferenceCountedAsyncDisposable.cs
@@ -1,4 +1,4 @@
-#if NETSTANDARD2_1
+#if !NETSTANDARD1_0 && !NETSTANDARD2_0 && !NET461
 using System;
 using System.Collections.Generic;
 using System.Text;
@@ -25,7 +25,7 @@ public ReferenceCountedAsyncDisposable(IReferenceCounter referenceCounter)
     }
 
     /// <inheritdoc/>
-    protected override ValueTask DisposeAsync(IReferenceCounter referenceCounter) => (referenceCounter.TryDecrementCount() as IAsyncDisposable)?.DisposeAsync() ?? new ValueTask();
+    protected override ValueTask DisposeAsync(IReferenceCounter context) => (context.TryDecrementCount() as IAsyncDisposable)?.DisposeAsync() ?? new ValueTask();
 
     T? IReferenceCountedAsyncDisposable<T>.Target => (T?) ReferenceCounter.TryGetTarget();
 

diff --git a/src/Nito.Disposables/Internals/ReferenceCountedDisposable.cs b/src/Nito.Disposables/Internals/ReferenceCountedDisposable.cs
@@ -21,7 +21,7 @@ public ReferenceCountedDisposable(IReferenceCounter referenceCounter)
     }
 
     /// <inheritdoc/>
-    protected override void Dispose(IReferenceCounter referenceCounter) => (referenceCounter.TryDecrementCount() as IDisposable)?.Dispose();
+    protected override void Dispose(IReferenceCounter context) => (context.TryDecrementCount() as IDisposable)?.Dispose();
 
     T? IReferenceCountedDisposable<T>.Target => (T?) ReferenceCounter.TryGetTarget();
 
@@ -30,7 +30,7 @@ IReferenceCountedDisposable<T> IReferenceCountedDisposable<T>.AddReference()
         var referenceCounter = ReferenceCounter;
         if (!referenceCounter.TryIncrementCount())
             throw new ObjectDisposedException(nameof(ReferenceCountedDisposable<T>)); // cannot actually happen
-        return new ReferenceCountedDisposable<T>(referenceCounter);
+		return new ReferenceCountedDisposable<T>(referenceCounter);
     }
 
     IWeakReferenceCountedDisposable<T> IReferenceCountedDisposable<T>.AddWeakReference() => new WeakReferenceCountedDisposable<T>(ReferenceCounter);

diff --git a/src/Nito.Disposables/Internals/WeakReferenceCountedAsyncDisposable.cs b/src/Nito.Disposables/Internals/WeakReferenceCountedAsyncDisposable.cs
@@ -1,4 +1,4 @@
-#if NETSTANDARD2_1
+#if !NETSTANDARD1_0 && !NETSTANDARD2_0 && !NET461
 using System;
 using System.Collections.Generic;
 using System.Text;

diff --git a/src/Nito.Disposables/Nito.Disposables.csproj b/src/Nito.Disposables/Nito.Disposables.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>IDisposable and IAsyncDisposable helper types.</Description>
-    <TargetFrameworks>netstandard1.0;netstandard2.0;netstandard2.1;net461</TargetFrameworks>
+    <TargetFrameworks>netstandard1.0;netstandard2.0;netstandard2.1;net461;net8.0</TargetFrameworks>
     <PackageTags>idisposable,iasyncdisposable,disposable</PackageTags>
   </PropertyGroup>
 

diff --git a/src/Nito.Disposables/NoopDisposable.cs b/src/Nito.Disposables/NoopDisposable.cs
@@ -7,7 +7,7 @@ namespace Nito.Disposables;
 /// A singleton disposable that does nothing when disposed.
 /// </summary>
 public sealed class NoopDisposable: IDisposable
-#if NETSTANDARD2_1
+#if !NETSTANDARD1_0 && !NETSTANDARD2_0 && !NET461
     , IAsyncDisposable
 #endif
 {
@@ -22,11 +22,11 @@ public void Dispose()
     {
     }
 
-#if NETSTANDARD2_1
+#if !NETSTANDARD1_0 && !NETSTANDARD2_0 && !NET461
     /// <summary>
-    /// Does nothing.
-    /// </summary>
-    public ValueTask DisposeAsync() => new ValueTask();
+	/// Does nothing.
+	/// </summary>
+	public ValueTask DisposeAsync() => new ValueTask();
 #endif
 
     /// <summary>

diff --git a/src/Nito.Disposables/ReferenceCountedAsyncDisposable.cs b/src/Nito.Disposables/ReferenceCountedAsyncDisposable.cs
@@ -1,4 +1,4 @@
-#if NETSTANDARD2_1
+#if !NETSTANDARD1_0 && !NETSTANDARD2_0 && !NET461
 using System;
 using System.Runtime.CompilerServices;
 using Nito.Disposables.Internals;

diff --git a/src/Nito.Disposables/SingleAsyncDisposable.cs b/src/Nito.Disposables/SingleAsyncDisposable.cs
@@ -1,4 +1,4 @@
-#if NETSTANDARD2_1
+#if !NETSTANDARD1_0 && !NETSTANDARD2_0 && !NET461
 using System;
 using System.Threading.Tasks;
 using Nito.Disposables.Internals;

diff --git a/src/Nito.Disposables/SingleNonblockingAsyncDisposable.cs b/src/Nito.Disposables/SingleNonblockingAsyncDisposable.cs
@@ -1,4 +1,4 @@
-#if NETSTANDARD2_1
+#if !NETSTANDARD1_0 && !NETSTANDARD2_0 && !NET461
 using System;
 using System.Threading.Tasks;
 using Nito.Disposables.Internals;