From 911581d8d415fd3968e50a56c5f6cb20e8ad6141 Mon Sep 17 00:00:00 2001 From: stevenaw Date: Sun, 29 Oct 2023 08:07:26 -0400 Subject: [PATCH] Final cleanup and ifdefs --- src/NUnitFramework/framework/Internal/DisposeHelper.cs | 4 ++++ .../framework/Internal/Execution/CompositeWorkItem.cs | 1 - src/NUnitFramework/testdata/LifeCycleFixture.cs | 1 - src/NUnitFramework/testdata/OneTimeSetUpTearDownData.cs | 1 - 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/NUnitFramework/framework/Internal/DisposeHelper.cs b/src/NUnitFramework/framework/Internal/DisposeHelper.cs index c0c97611f0..bc78dcb3d4 100644 --- a/src/NUnitFramework/framework/Internal/DisposeHelper.cs +++ b/src/NUnitFramework/framework/Internal/DisposeHelper.cs @@ -1,8 +1,10 @@ // Copyright (c) Charlie Poole, Rob Prouse and Contributors. MIT License - see LICENSE.txt using System; +#if NETFRAMEWORK using System.Diagnostics.CodeAnalysis; using System.Reflection; +#endif namespace NUnit.Framework.Internal { @@ -43,6 +45,7 @@ public static void EnsureDisposed(object? value) } } +#if NETFRAMEWORK private static bool TryGetAsyncDispose(Type type, [NotNullWhen(true)] out MethodInfo? method) { method = null; @@ -54,5 +57,6 @@ private static bool TryGetAsyncDispose(Type type, [NotNullWhen(true)] out Method method = asyncDisposable.GetMethod("DisposeAsync", Type.EmptyTypes); return method is not null; } +#endif } } diff --git a/src/NUnitFramework/framework/Internal/Execution/CompositeWorkItem.cs b/src/NUnitFramework/framework/Internal/Execution/CompositeWorkItem.cs index 8297fe3a8b..49380fdea9 100644 --- a/src/NUnitFramework/framework/Internal/Execution/CompositeWorkItem.cs +++ b/src/NUnitFramework/framework/Internal/Execution/CompositeWorkItem.cs @@ -7,7 +7,6 @@ using NUnit.Framework.Internal.Commands; using NUnit.Framework.Interfaces; using NUnit.Framework.Internal.Extensions; -using System.Linq; namespace NUnit.Framework.Internal.Execution { diff --git a/src/NUnitFramework/testdata/LifeCycleFixture.cs b/src/NUnitFramework/testdata/LifeCycleFixture.cs index a89b7151bd..bde5a76e7e 100644 --- a/src/NUnitFramework/testdata/LifeCycleFixture.cs +++ b/src/NUnitFramework/testdata/LifeCycleFixture.cs @@ -433,7 +433,6 @@ public void Dispose() public void VerifyDisposed() => Assert.That(DisposeCount, Is.EqualTo(1)); } - [TestFixture] [FixtureLifeCycle(LifeCycle.InstancePerTestCase)] public class InstancePerTestCaseWithAsyncDisposeTestCase : IAsyncDisposable diff --git a/src/NUnitFramework/testdata/OneTimeSetUpTearDownData.cs b/src/NUnitFramework/testdata/OneTimeSetUpTearDownData.cs index 7441c6c2dc..f6eff33b21 100644 --- a/src/NUnitFramework/testdata/OneTimeSetUpTearDownData.cs +++ b/src/NUnitFramework/testdata/OneTimeSetUpTearDownData.cs @@ -483,7 +483,6 @@ public void Dispose() } } - [TestFixture] public class AsyncDisposableFixture : IAsyncDisposable {