diff --git a/InfoPrint/Program.cs b/InfoPrint/Program.cs index 1248142a..a2915ddf 100644 --- a/InfoPrint/Program.cs +++ b/InfoPrint/Program.cs @@ -23,7 +23,7 @@ namespace InfoPrint // Loop through the input paths foreach (string inputPath in options.InputPaths) { -#if NETFRAMEWORK +#if NETFRAMEWORK || NETSTANDARD2_0_OR_GREATER PrintPathInfo(inputPath, false, options.Debug); #else PrintPathInfo(inputPath, options.Json, options.Debug); diff --git a/SabreTools.Serialization/Deserializers/CHD.cs b/SabreTools.Serialization/Deserializers/CHD.cs index 9f073da2..450c6c44 100644 --- a/SabreTools.Serialization/Deserializers/CHD.cs +++ b/SabreTools.Serialization/Deserializers/CHD.cs @@ -114,7 +114,7 @@ namespace SabreTools.Serialization.Deserializers return 0; // Match the version to header length -#if NET472_OR_GREATER || NETCOREAPP +#if NET472_OR_GREATER || NETCOREAPP || NETSTANDARD2_0_OR_GREATER return (version, length) switch { (1, Constants.HeaderV1Size) => version, diff --git a/SabreTools.Serialization/Deserializers/Listrom.cs b/SabreTools.Serialization/Deserializers/Listrom.cs index 2d777e3e..50020e7a 100644 --- a/SabreTools.Serialization/Deserializers/Listrom.cs +++ b/SabreTools.Serialization/Deserializers/Listrom.cs @@ -75,7 +75,7 @@ namespace SabreTools.Serialization.Deserializers } // Split the line for the name iteratively -#if NETFRAMEWORK || NETCOREAPP3_1 +#if NETFRAMEWORK || NETCOREAPP3_1 || NETSTANDARD2_0_OR_GREATER string[] lineParts = line.Split(new string[] { " " }, StringSplitOptions.RemoveEmptyEntries); if (lineParts.Length == 1) lineParts = line.Split(new string[] { " " }, StringSplitOptions.RemoveEmptyEntries); @@ -99,7 +99,7 @@ namespace SabreTools.Serialization.Deserializers if (trimmedLine == null) continue; -#if NETFRAMEWORK || NETCOREAPP3_1 +#if NETFRAMEWORK || NETCOREAPP3_1 || NETSTANDARD2_0_OR_GREATER lineParts = trimmedLine.Split(new char[] { ' ' }, StringSplitOptions.RemoveEmptyEntries); #else lineParts = trimmedLine.Split(' ', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries); diff --git a/SabreTools.Serialization/Deserializers/PortableExecutable.cs b/SabreTools.Serialization/Deserializers/PortableExecutable.cs index 15b192f9..c831e06b 100644 --- a/SabreTools.Serialization/Deserializers/PortableExecutable.cs +++ b/SabreTools.Serialization/Deserializers/PortableExecutable.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.IO; -#if NET35_OR_GREATER || NETCOREAPP +#if NET35_OR_GREATER || NETCOREAPP || NETSTANDARD2_0_OR_GREATER using System.Linq; #endif using System.Text; diff --git a/SabreTools.Serialization/Deserializers/XmlFile.cs b/SabreTools.Serialization/Deserializers/XmlFile.cs index 824eb85b..168f7ec8 100644 --- a/SabreTools.Serialization/Deserializers/XmlFile.cs +++ b/SabreTools.Serialization/Deserializers/XmlFile.cs @@ -25,7 +25,7 @@ namespace SabreTools.Serialization.Deserializers var settings = new XmlReaderSettings { CheckCharacters = false, -#if NET40_OR_GREATER || NETCOREAPP +#if NET40_OR_GREATER || NETCOREAPP || NETSTANDARD2_0_OR_GREATER DtdProcessing = DtdProcessing.Ignore, #endif ValidationFlags = XmlSchemaValidationFlags.None, diff --git a/SabreTools.Serialization/SabreTools.Serialization.csproj b/SabreTools.Serialization/SabreTools.Serialization.csproj index 2b4b699a..162b994a 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.csproj +++ b/SabreTools.Serialization/SabreTools.Serialization.csproj @@ -2,7 +2,7 @@ - net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0 + net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0;netstandard2.0;netstandard2.1 true false false diff --git a/SabreTools.Serialization/Serializers/XmlFile.cs b/SabreTools.Serialization/Serializers/XmlFile.cs index a6e58ee8..a9b2ba99 100644 --- a/SabreTools.Serialization/Serializers/XmlFile.cs +++ b/SabreTools.Serialization/Serializers/XmlFile.cs @@ -104,7 +104,7 @@ namespace SabreTools.Serialization.Serializers Encoding = Encoding.UTF8, Indent = true, IndentChars = "\t", -#if NET40_OR_GREATER || NETCOREAPP +#if NET40_OR_GREATER || NETCOREAPP || NETSTANDARD2_0_OR_GREATER NamespaceHandling = NamespaceHandling.OmitDuplicates, #endif NewLineChars = "\n", diff --git a/SabreTools.Serialization/Wrappers/PortableExecutable.cs b/SabreTools.Serialization/Wrappers/PortableExecutable.cs index 2c054146..79be32b2 100644 --- a/SabreTools.Serialization/Wrappers/PortableExecutable.cs +++ b/SabreTools.Serialization/Wrappers/PortableExecutable.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.IO; -#if NET35_OR_GREATER || NETCOREAPP +#if NET35_OR_GREATER || NETCOREAPP || NETSTANDARD2_0_OR_GREATER using System.Linq; #endif using System.Text;