From dde5a57136f63e736d098ebefdf15d8eb1ed0839 Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Fri, 29 Nov 2024 22:20:46 -0500
Subject: [PATCH] Fix some misconfigured framework gating

---
 InfoPrint/Options.cs                                    | 6 +++---
 InfoPrint/Program.cs                                    | 2 +-
 SabreTools.Serialization/ConcreteAbstractSerializer.cs  | 2 +-
 SabreTools.Serialization/ConcreteInterfaceSerializer.cs | 2 +-
 SabreTools.Serialization/Deserializers/RomCenter.cs     | 6 +-----
 SabreTools.Serialization/Interfaces/IWrapper.cs         | 2 +-
 SabreTools.Serialization/ObjectExtensions.cs            | 2 +-
 SabreTools.Serialization/Printer.cs                     | 2 +-
 SabreTools.Serialization/Wrappers/WrapperBase.cs        | 6 +++---
 9 files changed, 13 insertions(+), 17 deletions(-)

diff --git a/InfoPrint/Options.cs b/InfoPrint/Options.cs
index 8c0323b3..98bb6d1b 100644
--- a/InfoPrint/Options.cs
+++ b/InfoPrint/Options.cs
@@ -20,7 +20,7 @@ namespace InfoPrint
         /// </summary>
         public List<string> InputPaths { get; private set; } = [];
 
-#if NETCOREAPP3_1_OR_GREATER
+#if NETCOREAPP
         /// <summary>
         /// Enable JSON output
         /// </summary>
@@ -76,7 +76,7 @@ namespace InfoPrint
 
                     case "-j":
                     case "--json":
-#if NET6_0_OR_GREATER
+#if NETCOREAPP
                         options.Json = true;
 #else
                         Console.WriteLine("JSON output not available in .NET Framework");
@@ -111,7 +111,7 @@ namespace InfoPrint
             Console.WriteLine("Options:");
             Console.WriteLine("-?, -h, --help           Display this help text and quit");
             Console.WriteLine("-d, --debug              Enable debug mode");
-#if NET6_0_OR_GREATER
+#if NETCOREAPP
             Console.WriteLine("-j, --json               Print info as JSON");
 #endif
         }
diff --git a/InfoPrint/Program.cs b/InfoPrint/Program.cs
index 80ecce17..1248142a 100644
--- a/InfoPrint/Program.cs
+++ b/InfoPrint/Program.cs
@@ -95,7 +95,7 @@ namespace InfoPrint
                 // Get the base info output name
                 string filenameBase = $"info-{DateTime.Now:yyyy-MM-dd_HHmmss.ffff}";
 
-#if NET6_0_OR_GREATER
+#if NETCOREAPP
                 // If we have the JSON flag
                 if (json)
                 {
diff --git a/SabreTools.Serialization/ConcreteAbstractSerializer.cs b/SabreTools.Serialization/ConcreteAbstractSerializer.cs
index 9b2229b0..7fa713b2 100644
--- a/SabreTools.Serialization/ConcreteAbstractSerializer.cs
+++ b/SabreTools.Serialization/ConcreteAbstractSerializer.cs
@@ -1,4 +1,4 @@
-#if !NETFRAMEWORK
+#if NETCOREAPP
 
 using System;
 using System.Reflection;
diff --git a/SabreTools.Serialization/ConcreteInterfaceSerializer.cs b/SabreTools.Serialization/ConcreteInterfaceSerializer.cs
index 31b51825..e373f5e5 100644
--- a/SabreTools.Serialization/ConcreteInterfaceSerializer.cs
+++ b/SabreTools.Serialization/ConcreteInterfaceSerializer.cs
@@ -1,4 +1,4 @@
-#if !NETFRAMEWORK
+#if NETCOREAPP
 
 using System;
 using System.Reflection;
diff --git a/SabreTools.Serialization/Deserializers/RomCenter.cs b/SabreTools.Serialization/Deserializers/RomCenter.cs
index 60ced68f..1447553e 100644
--- a/SabreTools.Serialization/Deserializers/RomCenter.cs
+++ b/SabreTools.Serialization/Deserializers/RomCenter.cs
@@ -136,11 +136,7 @@ namespace SabreTools.Serialization.Deserializers
                         dat.Games ??= new Games();
 
                         // If the line doesn't contain the delimiter
-#if NETFRAMEWORK
-                    if (!(reader.CurrentLine?.Contains("¬") ?? false))
-#else
-                        if (!(reader.CurrentLine?.Contains('¬') ?? false))
-#endif
+                        if (!(reader.CurrentLine?.Contains("¬") ?? false))
                             continue;
 
                         // Otherwise, separate out the line
diff --git a/SabreTools.Serialization/Interfaces/IWrapper.cs b/SabreTools.Serialization/Interfaces/IWrapper.cs
index 3a355ea9..f07872fa 100644
--- a/SabreTools.Serialization/Interfaces/IWrapper.cs
+++ b/SabreTools.Serialization/Interfaces/IWrapper.cs
@@ -10,7 +10,7 @@ namespace SabreTools.Serialization.Interfaces
         /// </summary>
         string Description();
 
-#if !NETFRAMEWORK
+#if NETCOREAPP
         /// <summary>
         /// Export the item information as JSON
         /// </summary>
diff --git a/SabreTools.Serialization/ObjectExtensions.cs b/SabreTools.Serialization/ObjectExtensions.cs
index 518c8f0b..4738fce0 100644
--- a/SabreTools.Serialization/ObjectExtensions.cs
+++ b/SabreTools.Serialization/ObjectExtensions.cs
@@ -1,4 +1,4 @@
-#if !NETFRAMEWORK
+#if NETCOREAPP
 
 using System;
 
diff --git a/SabreTools.Serialization/Printer.cs b/SabreTools.Serialization/Printer.cs
index 59651a73..f13374c4 100644
--- a/SabreTools.Serialization/Printer.cs
+++ b/SabreTools.Serialization/Printer.cs
@@ -71,7 +71,7 @@ namespace SabreTools.Serialization
             };
         }
 
-#if NET6_0_OR_GREATER
+#if NETCOREAPP
         /// <summary>
         /// Export the item information as JSON
         /// </summary>
diff --git a/SabreTools.Serialization/Wrappers/WrapperBase.cs b/SabreTools.Serialization/Wrappers/WrapperBase.cs
index 313610d7..63ffef13 100644
--- a/SabreTools.Serialization/Wrappers/WrapperBase.cs
+++ b/SabreTools.Serialization/Wrappers/WrapperBase.cs
@@ -23,7 +23,7 @@ namespace SabreTools.Serialization.Wrappers
 
         #region JSON Export
 
-#if !NETFRAMEWORK
+#if NETCOREAPP
         /// <summary>
         /// Export the item information as JSON
         /// </summary>
@@ -77,7 +77,7 @@ namespace SabreTools.Serialization.Wrappers
         /// <remarks>This is only populated if <see cref="_dataSource"/> is <see cref="DataSource.Stream"/></remarks>
         protected Stream? _streamData = null;
 
-#if !NETFRAMEWORK
+#if NETCOREAPP
         /// <summary>
         /// JSON serializer options for output printing
         /// </summary>
@@ -364,7 +364,7 @@ namespace SabreTools.Serialization.Wrappers
 
         #region JSON Export
 
-#if !NETFRAMEWORK
+#if NETCOREAPP
         /// <summary>
         /// Export the item information as JSON
         /// </summary>