mirror of
https://github.com/SabreTools/SabreTools.Serialization.git
synced 2026-07-21 00:05:19 +00:00
Fix some misconfigured framework gating
This commit is contained in:
@@ -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
|
||||
}
|
||||
|
||||
@@ -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)
|
||||
{
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#if !NETFRAMEWORK
|
||||
#if NETCOREAPP
|
||||
|
||||
using System;
|
||||
using System.Reflection;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#if !NETFRAMEWORK
|
||||
#if NETCOREAPP
|
||||
|
||||
using System;
|
||||
using System.Reflection;
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -10,7 +10,7 @@ namespace SabreTools.Serialization.Interfaces
|
||||
/// </summary>
|
||||
string Description();
|
||||
|
||||
#if !NETFRAMEWORK
|
||||
#if NETCOREAPP
|
||||
/// <summary>
|
||||
/// Export the item information as JSON
|
||||
/// </summary>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#if !NETFRAMEWORK
|
||||
#if NETCOREAPP
|
||||
|
||||
using System;
|
||||
|
||||
|
||||
@@ -71,7 +71,7 @@ namespace SabreTools.Serialization
|
||||
};
|
||||
}
|
||||
|
||||
#if NET6_0_OR_GREATER
|
||||
#if NETCOREAPP
|
||||
/// <summary>
|
||||
/// Export the item information as JSON
|
||||
/// </summary>
|
||||
|
||||
@@ -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>
|
||||
|
||||
Reference in New Issue
Block a user