diff --git a/ExtractionTool/ExtractionTool.csproj b/ExtractionTool/ExtractionTool.csproj index d46e706d..e60fb6a7 100644 --- a/ExtractionTool/ExtractionTool.csproj +++ b/ExtractionTool/ExtractionTool.csproj @@ -49,7 +49,7 @@ - + diff --git a/InfoPrint/InfoPrint.csproj b/InfoPrint/InfoPrint.csproj index 2899ad81..f9ffd9fe 100644 --- a/InfoPrint/InfoPrint.csproj +++ b/InfoPrint/InfoPrint.csproj @@ -34,7 +34,7 @@ - + \ No newline at end of file diff --git a/SabreTools.Data.Extensions/MetadataExtensions.cs b/SabreTools.Data.Extensions/MetadataExtensions.cs index 23019145..aec23e62 100644 --- a/SabreTools.Data.Extensions/MetadataExtensions.cs +++ b/SabreTools.Data.Extensions/MetadataExtensions.cs @@ -463,11 +463,7 @@ namespace SabreTools.Data.Extensions bool spamsumNull = string.IsNullOrEmpty(spamsum) || string.Equals(spamsum, HashType.SpamSum.ZeroString, StringComparison.OrdinalIgnoreCase); string? blake3 = rom.BLAKE3; -#if NET7_0_OR_GREATER bool blake3Null = string.IsNullOrEmpty(blake3) || string.Equals(blake3, HashType.BLAKE3.ZeroString, StringComparison.OrdinalIgnoreCase); -#else - bool blake3Null = string.IsNullOrEmpty(blake3) || string.Equals(blake3, "af1349b9f5f9a1a6a0404dea36dcc9499bcb25c9adc112b7cc9a93cae41f3262", StringComparison.OrdinalIgnoreCase); -#endif return crc16Null && crc32Null diff --git a/SabreTools.Data.Extensions/SabreTools.Data.Extensions.csproj b/SabreTools.Data.Extensions/SabreTools.Data.Extensions.csproj index aedf359d..da96618b 100644 --- a/SabreTools.Data.Extensions/SabreTools.Data.Extensions.csproj +++ b/SabreTools.Data.Extensions/SabreTools.Data.Extensions.csproj @@ -32,7 +32,7 @@ - + diff --git a/SabreTools.Data.Models/SabreTools.Data.Models.csproj b/SabreTools.Data.Models/SabreTools.Data.Models.csproj index 49157a4a..8eef38e8 100644 --- a/SabreTools.Data.Models/SabreTools.Data.Models.csproj +++ b/SabreTools.Data.Models/SabreTools.Data.Models.csproj @@ -32,7 +32,7 @@ - + \ No newline at end of file diff --git a/SabreTools.Metadata.DatFiles/DatFile.cs b/SabreTools.Metadata.DatFiles/DatFile.cs index 829573d5..541cc66e 100644 --- a/SabreTools.Metadata.DatFiles/DatFile.cs +++ b/SabreTools.Metadata.DatFiles/DatFile.cs @@ -700,11 +700,7 @@ namespace SabreTools.Metadata.DatFiles rom.SHA384 = rom.SHA384 == "null" ? HashType.SHA384.ZeroString : null; rom.SHA512 = rom.SHA512 == "null" ? HashType.SHA512.ZeroString : null; rom.SpamSum = rom.SpamSum == "null" ? HashType.SpamSum.ZeroString : null; -#if NET7_0_OR_GREATER rom.BLAKE3 = rom.BLAKE3 == "null" ? HashType.BLAKE3.ZeroString : null; -#else - rom.BLAKE3 = rom.BLAKE3 == "null" ? "af1349b9f5f9a1a6a0404dea36dcc9499bcb25c9adc112b7cc9a93cae41f3262" : null; -#endif return rom; } diff --git a/SabreTools.Metadata.DatFiles/SabreTools.Metadata.DatFiles.csproj b/SabreTools.Metadata.DatFiles/SabreTools.Metadata.DatFiles.csproj index 82c256a3..f797a90d 100644 --- a/SabreTools.Metadata.DatFiles/SabreTools.Metadata.DatFiles.csproj +++ b/SabreTools.Metadata.DatFiles/SabreTools.Metadata.DatFiles.csproj @@ -47,7 +47,7 @@ - + diff --git a/SabreTools.Metadata.DatItems/DatItem.cs b/SabreTools.Metadata.DatItems/DatItem.cs index fc096929..c804e348 100644 --- a/SabreTools.Metadata.DatItems/DatItem.cs +++ b/SabreTools.Metadata.DatItems/DatItem.cs @@ -192,11 +192,7 @@ namespace SabreTools.Metadata.DatItems switch (bucketedBy) { case ItemKey.BLAKE3: -#if NET7_0_OR_GREATER key = HashType.BLAKE3.ZeroString; -#else - key = "af1349b9f5f9a1a6a0404dea36dcc9499bcb25c9adc112b7cc9a93cae41f3262"; -#endif break; case ItemKey.CRC16: diff --git a/SabreTools.Metadata.DatItems/SabreTools.Metadata.DatItems.csproj b/SabreTools.Metadata.DatItems/SabreTools.Metadata.DatItems.csproj index a1bc3846..7f747c78 100644 --- a/SabreTools.Metadata.DatItems/SabreTools.Metadata.DatItems.csproj +++ b/SabreTools.Metadata.DatItems/SabreTools.Metadata.DatItems.csproj @@ -33,7 +33,7 @@ - + diff --git a/SabreTools.Metadata.Filter/SabreTools.Metadata.Filter.csproj b/SabreTools.Metadata.Filter/SabreTools.Metadata.Filter.csproj index 0b269154..b4190400 100644 --- a/SabreTools.Metadata.Filter/SabreTools.Metadata.Filter.csproj +++ b/SabreTools.Metadata.Filter/SabreTools.Metadata.Filter.csproj @@ -36,7 +36,7 @@ - + \ No newline at end of file diff --git a/SabreTools.Metadata.Reports/SabreTools.Metadata.Reports.csproj b/SabreTools.Metadata.Reports/SabreTools.Metadata.Reports.csproj index c99b5a16..a620eafb 100644 --- a/SabreTools.Metadata.Reports/SabreTools.Metadata.Reports.csproj +++ b/SabreTools.Metadata.Reports/SabreTools.Metadata.Reports.csproj @@ -38,7 +38,7 @@ - + \ No newline at end of file diff --git a/SabreTools.Serialization.Readers/SabreTools.Serialization.Readers.csproj b/SabreTools.Serialization.Readers/SabreTools.Serialization.Readers.csproj index bd048503..6bd2c18e 100644 --- a/SabreTools.Serialization.Readers/SabreTools.Serialization.Readers.csproj +++ b/SabreTools.Serialization.Readers/SabreTools.Serialization.Readers.csproj @@ -37,7 +37,7 @@ - + diff --git a/SabreTools.Serialization.Writers/SabreTools.Serialization.Writers.csproj b/SabreTools.Serialization.Writers/SabreTools.Serialization.Writers.csproj index a47e64d2..5cb7ae84 100644 --- a/SabreTools.Serialization.Writers/SabreTools.Serialization.Writers.csproj +++ b/SabreTools.Serialization.Writers/SabreTools.Serialization.Writers.csproj @@ -33,7 +33,7 @@ - + diff --git a/SabreTools.Serialization/SabreTools.Serialization.csproj b/SabreTools.Serialization/SabreTools.Serialization.csproj index 404b0559..537d61b4 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.csproj +++ b/SabreTools.Serialization/SabreTools.Serialization.csproj @@ -65,7 +65,7 @@ - + diff --git a/SabreTools.Wrappers/SabreTools.Wrappers.csproj b/SabreTools.Wrappers/SabreTools.Wrappers.csproj index 3835f450..613f33f0 100644 --- a/SabreTools.Wrappers/SabreTools.Wrappers.csproj +++ b/SabreTools.Wrappers/SabreTools.Wrappers.csproj @@ -47,7 +47,7 @@ - +