Add a .NET 8.0 target (#4884)

* Add a .NET 8.0 target * Added test to ensure we no longer forget to update libraries in .nuspec files. * Stupid backslashes in directory separators
nunit · Nov 26, 2024 · 0c1ef7f · 0c1ef7f
1 parent 6e14a0f
commit 0c1ef7f
Show file tree

Hide file tree

Showing 23 changed files with 212 additions and 14 deletions.
diff --git a/CakeScripts.Tests/CakeScripts.Tests.csproj b/CakeScripts.Tests/CakeScripts.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 

diff --git a/CakeScripts/CakeScripts.csproj b/CakeScripts/CakeScripts.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

diff --git a/nuget/framework/nunit.nuspec b/nuget/framework/nunit.nuspec
@@ -25,7 +25,8 @@
 
             Supported platforms:
             - .NET Framework 4.6.2+
-            - .NET 6.0+
+            - .NET 6.0
+            - .NET 8.0+
         </description>
         <releaseNotes>See release notes at https://docs.nunit.org/articles/nunit/release-notes/framework.html#nunit-400---november-26-2023</releaseNotes>
         <language>en-US</language>
@@ -38,6 +39,7 @@
                 <dependency id="System.Memory" version="4.5.5" exclude="Build,Analyzers" />
             </group>
             <group targetFramework="net6.0" />
+            <group targetFramework="net8.0" />
         </dependencies>
     </metadata>
     <files>
@@ -58,6 +60,12 @@
         <file src="bin/net6.0/nunit.framework.legacy.dll" target="lib\net6.0" />
         <file src="bin/net6.0/nunit.framework.legacy.xml" target="lib\net6.0" />
         <file src="bin/net6.0/nunit.framework.legacy.pdb" target="lib\net6.0" />
+        <file src="bin/net8.0/nunit.framework.dll" target="lib\net8.0" />
+        <file src="bin/net8.0/nunit.framework.xml" target="lib\net8.0" />
+        <file src="bin/net8.0/nunit.framework.pdb" target="lib\net8.0" />
+        <file src="bin/net8.0/nunit.framework.legacy.dll" target="lib\net8.0" />
+        <file src="bin/net8.0/nunit.framework.legacy.pdb" target="lib\net8.0" />
+        <file src="bin/net8.0/nunit.framework.legacy.xml" target="lib\net8.0" />
         <file src="..\..\nuget\framework\NUnit.props" target="build" />
     </files>
 </package>
diff --git a/nuget/nunitlite/nunitlite.nuspec b/nuget/nunitlite/nunitlite.nuspec
@@ -16,7 +16,8 @@
 
 Supported platforms:
 - .NET Framework 4.6.2+
-- .NET 6.0+
+- .NET 6.0
+- .NET 8.0+
 
 How to use this package:
 
@@ -34,9 +35,6 @@ How to use this package:
         <dependency id="NUnit" version="[$version$]" />
       </group>
       <group targetFramework="net8.0">
-        <dependency id="NUnit" version="[$version$]" />      
-      </group>
-	  <group targetFramework="net9.0">
         <dependency id="NUnit" version="[$version$]" />
       </group>
     </dependencies>
@@ -52,7 +50,7 @@ How to use this package:
     <file src="bin/net462/nunitlite-runner.pdb" target="tools\net462" />
     <file src="bin/net6.0/nunitlite.dll" target="lib\net6.0" />
     <file src="bin/net6.0/nunitlite.pdb" target="lib\net6.0" />
-	<file src="bin/net8.0/nunitlite.dll" target="lib\net8.0" />
+    <file src="bin/net8.0/nunitlite.dll" target="lib\net8.0" />
     <file src="bin/net8.0/nunitlite.pdb" target="lib\net8.0" />
   </files>
 </package>
diff --git a/src/NUnitFramework/Directory.Build.props b/src/NUnitFramework/Directory.Build.props
@@ -7,13 +7,13 @@
     <AssemblyOriginatorKeyFile>..\..\nunit.snk</AssemblyOriginatorKeyFile>
     <DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
-    <NUnitLibraryFrameworks>net462;net6.0</NUnitLibraryFrameworks>
+    <NUnitLibraryFrameworks>net462;net6.0;net8.0</NUnitLibraryFrameworks>
     <NUnitRuntimeFrameworks>net462;net6.0;net8.0;net9.0</NUnitRuntimeFrameworks>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
     <!--<OutputPath>..\..\..\bin\$(Configuration)\</OutputPath>-->
     <CheckEolTargetFramework>false</CheckEolTargetFramework>
     <Nullable>enable</Nullable>
-    <AnnotatedReferenceAssemblyVersion>7.0.0</AnnotatedReferenceAssemblyVersion>
+    <AnnotatedReferenceAssemblyVersion>8.0.0</AnnotatedReferenceAssemblyVersion>
     <GenerateNullableAttributes>false</GenerateNullableAttributes>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <CsWinRTAotOptimizerEnabled>false</CsWinRTAotOptimizerEnabled>

diff --git a/src/NUnitFramework/framework/Exceptions/AssertionException.cs b/src/NUnitFramework/framework/Exceptions/AssertionException.cs
@@ -26,13 +26,15 @@ public AssertionException(string message, Exception? inner) : base(message, inne
         {
         }
 
+#if !NET8_0_OR_GREATER
         /// <summary>
         /// Serialization Constructor
         /// </summary>
         protected AssertionException(System.Runtime.Serialization.SerializationInfo info,
             System.Runtime.Serialization.StreamingContext context) : base(info, context)
         {
         }
+#endif
 
         /// <summary>
         /// Gets the ResultState provided by this exception

diff --git a/src/NUnitFramework/framework/Exceptions/IgnoreException.cs b/src/NUnitFramework/framework/Exceptions/IgnoreException.cs
@@ -25,13 +25,15 @@ public IgnoreException(string message, Exception? inner) : base(message, inner)
         {
         }
 
+#if !NET8_0_OR_GREATER
         /// <summary>
         /// Serialization Constructor
         /// </summary>
         protected IgnoreException(System.Runtime.Serialization.SerializationInfo info,
             System.Runtime.Serialization.StreamingContext context) : base(info, context)
         {
         }
+#endif
 
         /// <summary>
         /// Gets the ResultState provided by this exception

diff --git a/src/NUnitFramework/framework/Exceptions/InconclusiveException.cs b/src/NUnitFramework/framework/Exceptions/InconclusiveException.cs
@@ -28,6 +28,7 @@ public InconclusiveException(string message, Exception? inner)
         {
         }
 
+#if !NET8_0_OR_GREATER
         /// <summary>
         /// Serialization Constructor
         /// </summary>
@@ -36,6 +37,7 @@ protected InconclusiveException(System.Runtime.Serialization.SerializationInfo i
             : base(info, context)
         {
         }
+#endif
 
         /// <summary>
         /// Gets the ResultState provided by this exception

diff --git a/src/NUnitFramework/framework/Exceptions/MultipleAssertException.cs b/src/NUnitFramework/framework/Exceptions/MultipleAssertException.cs
@@ -28,6 +28,7 @@ public MultipleAssertException(ITestResult testResult)
             TestResult = testResult;
         }
 
+#if !NET8_0_OR_GREATER
 #pragma warning disable CS8618 // Non-nullable field is uninitialized. Consider declaring as nullable.
         /// <summary>
         /// Serialization Constructor
@@ -37,6 +38,7 @@ protected MultipleAssertException(System.Runtime.Serialization.SerializationInfo
         {
         }
 #pragma warning restore CS8618 // Non-nullable field is uninitialized. Consider declaring as nullable.
+#endif
 
         /// <summary>
         /// Gets the <see cref="ResultState"/> provided by this exception.

diff --git a/src/NUnitFramework/framework/Exceptions/ResultStateException.cs b/src/NUnitFramework/framework/Exceptions/ResultStateException.cs
@@ -26,13 +26,15 @@ public ResultStateException(string message, Exception? inner) : base(message, in
         {
         }
 
+#if !NET8_0_OR_GREATER
         /// <summary>
         /// Serialization Constructor
         /// </summary>
         protected ResultStateException(System.Runtime.Serialization.SerializationInfo info,
             System.Runtime.Serialization.StreamingContext context) : base(info, context)
         {
         }
+#endif
 
         /// <summary>
         /// Gets the ResultState provided by this exception

diff --git a/src/NUnitFramework/framework/Exceptions/SuccessException.cs b/src/NUnitFramework/framework/Exceptions/SuccessException.cs
@@ -27,6 +27,7 @@ public SuccessException(string message, Exception? inner)
         {
         }
 
+#if !NET8_0_OR_GREATER
         /// <summary>
         /// Serialization Constructor
         /// </summary>
@@ -35,6 +36,7 @@ protected SuccessException(System.Runtime.Serialization.SerializationInfo info,
             : base(info, context)
         {
         }
+#endif
 
         /// <summary>
         /// Gets the ResultState provided by this exception

diff --git a/src/NUnitFramework/framework/Internal/InvalidDataSourceException.cs b/src/NUnitFramework/framework/Internal/InvalidDataSourceException.cs
@@ -3,7 +3,9 @@
 namespace NUnit.Framework.Internal
 {
     using System;
+#if !NET8_0_OR_GREATER
     using System.Runtime.Serialization;
+#endif
 
     /// <summary>
     /// InvalidTestFixtureException is thrown when an appropriate test
@@ -36,12 +38,14 @@ public InvalidDataSourceException(string message, Exception inner) : base(messag
         {
         }
 
+#if !NET8_0_OR_GREATER
         /// <summary>
         /// Serialization Constructor
         /// </summary>
         protected InvalidDataSourceException(SerializationInfo info,
             StreamingContext context) : base(info, context)
         {
         }
+#endif
     }
 }
diff --git a/src/NUnitFramework/framework/Internal/InvalidPlatformException.cs b/src/NUnitFramework/framework/Internal/InvalidPlatformException.cs
@@ -1,7 +1,9 @@
 // Copyright (c) Charlie Poole, Rob Prouse and Contributors. MIT License - see LICENSE.txt
 
 using System;
+#if !NET8_0_OR_GREATER
 using System.Runtime.Serialization;
+#endif
 
 namespace NUnit.Framework.Internal
 {
@@ -36,12 +38,14 @@ public InvalidPlatformException(string message, Exception inner) : base(message,
         {
         }
 
+#if !NET8_0_OR_GREATER
         /// <summary>
         /// Serialization constructor for the <see cref="InvalidPlatformException"/> class
         /// </summary>
         protected InvalidPlatformException(SerializationInfo info, StreamingContext context)
             : base(info, context)
         {
         }
+#endif
     }
 }
diff --git a/src/NUnitFramework/framework/Internal/InvalidTestFixtureException.cs b/src/NUnitFramework/framework/Internal/InvalidTestFixtureException.cs
@@ -3,7 +3,9 @@
 namespace NUnit.Framework.Internal
 {
     using System;
+#if !NET8_0_OR_GREATER
     using System.Runtime.Serialization;
+#endif
 
     /// <summary>
     /// InvalidTestFixtureException is thrown when an appropriate test
@@ -36,12 +38,14 @@ public InvalidTestFixtureException(string message, Exception inner) : base(messa
         {
         }
 
+#if !NET8_0_OR_GREATER
         /// <summary>
         /// Serialization Constructor
         /// </summary>
         protected InvalidTestFixtureException(SerializationInfo info,
             StreamingContext context) : base(info, context)
         {
         }
+#endif
     }
 }
diff --git a/src/NUnitFramework/framework/Internal/MethodWrapper.cs b/src/NUnitFramework/framework/Internal/MethodWrapper.cs
@@ -159,7 +159,7 @@ public override string ToString()
         /// <inheritdoc />
         public bool Equals(MethodWrapper? other)
         {
-            if (ReferenceEquals(null, other))
+            if (other is null)
             {
                 return false;
             }
@@ -175,7 +175,7 @@ public bool Equals(MethodWrapper? other)
         /// <inheritdoc />
         public override bool Equals(object? obj)
         {
-            if (ReferenceEquals(null, obj))
+            if (obj is null)
             {
                 return false;
             }

diff --git a/src/NUnitFramework/framework/Internal/NUnitException.cs b/src/NUnitFramework/framework/Internal/NUnitException.cs
@@ -3,7 +3,9 @@
 namespace NUnit.Framework.Internal
 {
     using System;
+#if !NET8_0_OR_GREATER
     using System.Runtime.Serialization;
+#endif
 
     /// <summary>
     /// Thrown when an assertion failed. Here to preserve the inner
@@ -40,12 +42,14 @@ public NUnitException(string message, Exception? inner)
         {
         }
 
+#if !NET8_0_OR_GREATER
         /// <summary>
         /// Serialization Constructor
         /// </summary>
         protected NUnitException(SerializationInfo info,
             StreamingContext context) : base(info, context)
         {
         }
+#endif
     }
 }
diff --git a/src/NUnitFramework/framework/Internal/TestCaseTimeoutException.cs b/src/NUnitFramework/framework/Internal/TestCaseTimeoutException.cs
@@ -3,7 +3,9 @@
 namespace NUnit.Framework.Internal
 {
     using System;
+#if !NET8_0_OR_GREATER
     using System.Runtime.Serialization;
+#endif
 
     /// <summary>
     /// TestCaseTimeoutException is thrown when a test running directly
@@ -36,12 +38,14 @@ public TestCaseTimeoutException(string message, Exception inner) : base(message,
         {
         }
 
+#if !NET8_0_OR_GREATER
         /// <summary>
         /// Serialization Constructor
         /// </summary>
         protected TestCaseTimeoutException(SerializationInfo info,
             StreamingContext context) : base(info, context)
         {
         }
+#endif
     }
 }
diff --git a/src/NUnitFramework/nunitlite/Options.cs b/src/NUnitFramework/nunitlite/Options.cs
@@ -134,8 +134,12 @@
 using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.IO;
+#if !NET8_0_OR_GREATER
 using System.Runtime.Serialization;
+#if !NET6_0_OR_GREATER
 using System.Security.Permissions;
+#endif
+#endif
 using System.Text;
 using System.Text.RegularExpressions;
 
@@ -569,14 +573,17 @@ public OptionException(string message, string optionName, Exception innerExcepti
             _option = optionName;
         }
 
+#if !NET8_0_OR_GREATER
         protected OptionException(SerializationInfo info, StreamingContext context)
             : base(info, context)
         {
             _option = info.GetString("OptionName");
         }
+#endif
 
         public string OptionName => _option;
 
+#if !NET8_0_OR_GREATER
 #if !NET6_0_OR_GREATER
         [SecurityPermission(SecurityAction.LinkDemand, SerializationFormatter = true)]
 #endif
@@ -585,6 +592,7 @@ public override void GetObjectData(SerializationInfo info, StreamingContext cont
             base.GetObjectData(info, context);
             info.AddValue("OptionName", _option);
         }
+#endif
     }
 
     public delegate void OptionAction<TKey, TValue>(TKey key, TValue value);

diff --git a/src/NUnitFramework/nunitlite/OutputWriters/OutputWriter.cs b/src/NUnitFramework/nunitlite/OutputWriters/OutputWriter.cs
@@ -21,6 +21,7 @@ public abstract class OutputWriter
         /// <param name="result">The result to be written</param>
         /// <param name="outputPath">Path to the file to which the result is written</param>
         /// <param name="runSettings">A dictionary of settings used for this test run</param>
+        /// <param name="filter">The filter to apply</param>
         public void WriteResultFile(ITestResult result, string outputPath, IDictionary<string, object> runSettings, TestFilter filter)
         {
             using (var stream = new FileStream(outputPath, FileMode.Create))