diff --git a/SabreTools.Help/Feature.cs b/SabreTools.Help/Feature.cs index cc46a235..ca212b68 100644 --- a/SabreTools.Help/Feature.cs +++ b/SabreTools.Help/Feature.cs @@ -235,7 +235,7 @@ namespace SabreTools.Help output = CreatePadding(pre + 4); } - output += subsplit[^1]; + output += subsplit[subsplit.Length - 1]; continue; } @@ -372,7 +372,7 @@ namespace SabreTools.Help output = CreatePadding(preAdjusted + 4); } - output += subsplit[^1]; + output += subsplit[subsplit.Length - 1]; continue; } diff --git a/SabreTools.Help/FeatureSet.cs b/SabreTools.Help/FeatureSet.cs index 4be7db28..28d37762 100644 --- a/SabreTools.Help/FeatureSet.cs +++ b/SabreTools.Help/FeatureSet.cs @@ -207,14 +207,14 @@ namespace SabreTools.Help } // If we have a match within the flags - else if (_features[feature]!.ContainsFlag(featurename)) + else if (_features[feature]!.ContainsFlag(featurename!)) { realname = feature; break; } // Otherwise, we want to get features with the same start - else if (_features[feature]!.StartsWith(featurename.TrimStart('-')[0])) + else if (_features[feature]!.StartsWith(featurename!.TrimStart('-')[0])) { startsWith.Add(feature); } @@ -284,7 +284,7 @@ namespace SabreTools.Help private Dictionary GetEnabledSubfeatures(string key, Feature? feature) { Dictionary enabled = []; - + // If the feature is invalid if (feature == null) return enabled; @@ -340,7 +340,9 @@ namespace SabreTools.Help /// private static void Pause() { +#if NET452_OR_GREATER || NETCOREAPP if (!Console.IsOutputRedirected) +#endif { Console.WriteLine(); Console.WriteLine("Press enter to continue..."); diff --git a/SabreTools.Help/SabreTools.Help.csproj b/SabreTools.Help/SabreTools.Help.csproj index c4102ee3..faf23cf0 100644 --- a/SabreTools.Help/SabreTools.Help.csproj +++ b/SabreTools.Help/SabreTools.Help.csproj @@ -1,10 +1,23 @@  - net6.0;net8.0 + + net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0 + win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64 + false + false latest enable + true true + 1.1.2 + + + Matt Nadareski + Copyright (c)2016-2024 Matt Nadareski + https://github.com/SabreTools/ + https://github.com/SabreTools/SabreTools + git diff --git a/SabreTools.Help/TopLevel.cs b/SabreTools.Help/TopLevel.cs index d437af1c..4df08930 100644 --- a/SabreTools.Help/TopLevel.cs +++ b/SabreTools.Help/TopLevel.cs @@ -60,7 +60,11 @@ namespace SabreTools.Help } // Special precautions for wildcarded inputs (potential paths) +#if NETFRAMEWORK + else if (args[i].Contains("*") || args[i].Contains("?")) +#else else if (args[i].Contains('*') || args[i].Contains('?')) +#endif { Inputs.Add(args[i]); }