Merge pull request #1593 from nunit/issue-1592

Eliminate duplication of console code
nunit · Jan 3, 2025 · 68032ff · 68032ff
2 parents 8fdb712 + 6251bd7
commit 68032ff
Show file tree

Hide file tree

Showing 25 changed files with 27 additions and 5,066 deletions.
diff --git a/src/NUnitConsole/nunit4-console/Options/Options.cs b/src/NUnitConsole/nunit4-console/Options/Options.cs
@@ -777,6 +777,9 @@ public OptionException(string message, string? optionName, Exception innerExcept
         }
 
 #if !PCL
+#if NET8_0_OR_GREATER
+        [Obsolete]
+#endif
         protected OptionException(SerializationInfo info, StreamingContext context)
             : base(info, context)
         {
@@ -790,6 +793,9 @@ public string? OptionName
         }
 
 #if !PCL
+#if NET8_0_OR_GREATER
+        [Obsolete]
+#endif
         public override void GetObjectData(SerializationInfo info, StreamingContext context)
         {
             base.GetObjectData(info, context);

diff --git a/src/NUnitConsole/nunit4-console/Program.cs b/src/NUnitConsole/nunit4-console/Program.cs
@@ -97,7 +97,6 @@ public static int Main(string[] args)
                         return ConsoleRunner.INVALID_ARG;
                     }
 
-#if NETFRAMEWORK
                     if (Options.RuntimeFrameworkSpecified)
                     {
                         var availableRuntimeService = engine.Services.GetService<IAvailableRuntimes>();
@@ -118,7 +117,6 @@ public static int Main(string[] args)
                         if (!runtimeAvailable)
                             WriteErrorMessage("Unavailable runtime framework requested: " + Options.RuntimeFramework);
                     }
-#endif
 
                     if (Options.WorkDirectory != null)
                         engine.WorkDirectory = Options.WorkDirectory;

diff --git a/src/NUnitConsole/nunit4-netcore-console/ColorConsole.cs b/src/NUnitConsole/nunit4-netcore-console/ColorConsole.cs
diff --git a/src/NUnitConsole/nunit4-netcore-console/ColorConsoleWriter.cs b/src/NUnitConsole/nunit4-netcore-console/ColorConsoleWriter.cs
diff --git a/src/NUnitConsole/nunit4-netcore-console/ColorStyle.cs b/src/NUnitConsole/nunit4-netcore-console/ColorStyle.cs