diff --git a/Charts/TitlesIni.cs b/Charts/TitlesIni.cs index 3ce159d..a783958 100644 --- a/Charts/TitlesIni.cs +++ b/Charts/TitlesIni.cs @@ -16,6 +16,10 @@ namespace SabreTools.Models.Charts /// `name` - Display name of the tier. /// `unlock_id` - Name used for associating a song with this tier, and for checking unlock requirements. /// +#if NET20 || NET35 + public Dictionary>? Sections { get; set; } +#else public Dictionary? Sections { get; set; } +#endif } } \ No newline at end of file diff --git a/Metadata/DictionaryBase.cs b/Metadata/DictionaryBase.cs index cbd5c9f..364a55d 100644 --- a/Metadata/DictionaryBase.cs +++ b/Metadata/DictionaryBase.cs @@ -100,7 +100,7 @@ namespace SabreTools.Models.Metadata string[]? asArray = Read(key); if (asArray != null) -#if NET48 +#if NETFRAMEWORK return string.Join(",", asArray); #else return string.Join(',', asArray); @@ -140,7 +140,11 @@ namespace SabreTools.Models.Metadata /// private bool ValidateKey(string key) { +#if NET20 || NET35 + if (key == null || string.IsNullOrEmpty(key.TrimEnd(' '))) +#else if (string.IsNullOrWhiteSpace(key)) +#endif return false; else if (!ContainsKey(key)) return false; diff --git a/SabreTools.Models.csproj b/SabreTools.Models.csproj index 1ca0aaf..3dd82cd 100644 --- a/SabreTools.Models.csproj +++ b/SabreTools.Models.csproj @@ -2,7 +2,7 @@ - net48;netcoreapp3.1;net6.0;net7.0;net8.0 + net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net6.0;net7.0;net8.0 win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64;osx-arm64 latest enable @@ -24,6 +24,17 @@ + + + + + + + + + + +