From 5f0fdcfd8de20747852a4dfb405a524e32218986 Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Tue, 24 Mar 2026 18:02:49 -0400 Subject: [PATCH] Update to IO 2.0.0 --- ExtractionTool/ExtractionTool.csproj | 2 +- InfoPrint/InfoPrint.csproj | 4 +- .../MetadataExtensionsTests.cs | 68 +++++++++---------- .../MetadataExtensions.cs | 34 +++++----- .../SabreTools.Data.Extensions.csproj | 2 +- .../SabreTools.Data.Models.csproj | 2 +- ...Tools.Serialization.CrossModel.Test.csproj | 2 +- ...SabreTools.Serialization.CrossModel.csproj | 4 +- .../ListromTests.cs | 28 ++++---- .../SabreTools.Serialization.Readers.csproj | 4 +- .../SabreTools.Serialization.Writers.csproj | 4 +- .../SabreTools.Serialization.csproj | 9 ++- .../SabreTools.Wrappers.csproj | 4 +- 13 files changed, 86 insertions(+), 81 deletions(-) diff --git a/ExtractionTool/ExtractionTool.csproj b/ExtractionTool/ExtractionTool.csproj index 36483562..e10a8edd 100644 --- a/ExtractionTool/ExtractionTool.csproj +++ b/ExtractionTool/ExtractionTool.csproj @@ -49,7 +49,7 @@ - + diff --git a/InfoPrint/InfoPrint.csproj b/InfoPrint/InfoPrint.csproj index 232585b2..e28c017b 100644 --- a/InfoPrint/InfoPrint.csproj +++ b/InfoPrint/InfoPrint.csproj @@ -33,8 +33,8 @@ - - + + \ No newline at end of file diff --git a/SabreTools.Data.Extensions.Test/MetadataExtensionsTests.cs b/SabreTools.Data.Extensions.Test/MetadataExtensionsTests.cs index fe52bc84..8ca70ea1 100644 --- a/SabreTools.Data.Extensions.Test/MetadataExtensionsTests.cs +++ b/SabreTools.Data.Extensions.Test/MetadataExtensionsTests.cs @@ -850,7 +850,7 @@ namespace SabreTools.Data.Extensions.Test { DictionaryBase self = new Disk { - [Disk.MD5Key] = ZeroHash.MD5Str, + [Disk.MD5Key] = HashType.MD5.ZeroString, [Disk.SHA1Key] = string.Empty, }; @@ -864,7 +864,7 @@ namespace SabreTools.Data.Extensions.Test DictionaryBase self = new Disk { [Disk.MD5Key] = string.Empty, - [Disk.SHA1Key] = ZeroHash.SHA1Str, + [Disk.SHA1Key] = HashType.SHA1.ZeroString, }; bool actual = self.HasZeroHash(); @@ -876,8 +876,8 @@ namespace SabreTools.Data.Extensions.Test { DictionaryBase self = new Disk { - [Disk.MD5Key] = ZeroHash.MD5Str, - [Disk.SHA1Key] = ZeroHash.SHA1Str, + [Disk.MD5Key] = HashType.MD5.ZeroString, + [Disk.SHA1Key] = HashType.SHA1.ZeroString, }; bool actual = self.HasZeroHash(); @@ -912,7 +912,7 @@ namespace SabreTools.Data.Extensions.Test { DictionaryBase self = new Media { - [Media.MD5Key] = ZeroHash.MD5Str, + [Media.MD5Key] = HashType.MD5.ZeroString, [Media.SHA1Key] = string.Empty, [Media.SHA256Key] = string.Empty, [Media.SpamSumKey] = string.Empty, @@ -928,7 +928,7 @@ namespace SabreTools.Data.Extensions.Test DictionaryBase self = new Media { [Media.MD5Key] = string.Empty, - [Media.SHA1Key] = ZeroHash.SHA1Str, + [Media.SHA1Key] = HashType.SHA1.ZeroString, [Media.SHA256Key] = string.Empty, [Media.SpamSumKey] = string.Empty, }; @@ -944,7 +944,7 @@ namespace SabreTools.Data.Extensions.Test { [Media.MD5Key] = string.Empty, [Media.SHA1Key] = string.Empty, - [Media.SHA256Key] = ZeroHash.SHA256Str, + [Media.SHA256Key] = HashType.SHA256.ZeroString, [Media.SpamSumKey] = string.Empty, }; @@ -960,7 +960,7 @@ namespace SabreTools.Data.Extensions.Test [Media.MD5Key] = string.Empty, [Media.SHA1Key] = string.Empty, [Media.SHA256Key] = string.Empty, - [Media.SpamSumKey] = ZeroHash.SpamSumStr, + [Media.SpamSumKey] = HashType.SpamSum.ZeroString, }; bool actual = self.HasZeroHash(); @@ -972,10 +972,10 @@ namespace SabreTools.Data.Extensions.Test { DictionaryBase self = new Media { - [Media.MD5Key] = ZeroHash.MD5Str, - [Media.SHA1Key] = ZeroHash.SHA1Str, - [Media.SHA256Key] = ZeroHash.SHA256Str, - [Media.SpamSumKey] = ZeroHash.SpamSumStr, + [Media.MD5Key] = HashType.MD5.ZeroString, + [Media.SHA1Key] = HashType.SHA1.ZeroString, + [Media.SHA256Key] = HashType.SHA256.ZeroString, + [Media.SpamSumKey] = HashType.SpamSum.ZeroString, }; bool actual = self.HasZeroHash(); @@ -1017,7 +1017,7 @@ namespace SabreTools.Data.Extensions.Test { DictionaryBase self = new Rom { - [Rom.CRCKey] = ZeroHash.CRC32Str, + [Rom.CRCKey] = HashType.CRC32.ZeroString, [Rom.MD2Key] = string.Empty, [Rom.MD4Key] = string.Empty, [Rom.MD5Key] = string.Empty, @@ -1040,7 +1040,7 @@ namespace SabreTools.Data.Extensions.Test DictionaryBase self = new Rom { [Rom.CRCKey] = string.Empty, - [Rom.MD2Key] = ZeroHash.GetString(HashType.MD2), + [Rom.MD2Key] = HashType.MD2.ZeroString, [Rom.MD4Key] = string.Empty, [Rom.MD5Key] = string.Empty, [Rom.RIPEMD128Key] = string.Empty, @@ -1063,7 +1063,7 @@ namespace SabreTools.Data.Extensions.Test { [Rom.CRCKey] = string.Empty, [Rom.MD2Key] = string.Empty, - [Rom.MD4Key] = ZeroHash.GetString(HashType.MD4), + [Rom.MD4Key] = HashType.MD4.ZeroString, [Rom.MD5Key] = string.Empty, [Rom.RIPEMD128Key] = string.Empty, [Rom.RIPEMD160Key] = string.Empty, @@ -1086,7 +1086,7 @@ namespace SabreTools.Data.Extensions.Test [Rom.CRCKey] = string.Empty, [Rom.MD2Key] = string.Empty, [Rom.MD4Key] = string.Empty, - [Rom.MD5Key] = ZeroHash.MD5Str, + [Rom.MD5Key] = HashType.MD5.ZeroString, [Rom.RIPEMD128Key] = string.Empty, [Rom.RIPEMD160Key] = string.Empty, [Rom.SHA1Key] = string.Empty, @@ -1109,7 +1109,7 @@ namespace SabreTools.Data.Extensions.Test [Rom.MD2Key] = string.Empty, [Rom.MD4Key] = string.Empty, [Rom.MD5Key] = string.Empty, - [Rom.RIPEMD128Key] = ZeroHash.GetString(HashType.RIPEMD128), + [Rom.RIPEMD128Key] = HashType.RIPEMD128.ZeroString, [Rom.RIPEMD160Key] = string.Empty, [Rom.SHA1Key] = string.Empty, [Rom.SHA256Key] = string.Empty, @@ -1132,7 +1132,7 @@ namespace SabreTools.Data.Extensions.Test [Rom.MD4Key] = string.Empty, [Rom.MD5Key] = string.Empty, [Rom.RIPEMD128Key] = string.Empty, - [Rom.RIPEMD160Key] = ZeroHash.GetString(HashType.RIPEMD160), + [Rom.RIPEMD160Key] = HashType.RIPEMD160.ZeroString, [Rom.SHA1Key] = string.Empty, [Rom.SHA256Key] = string.Empty, [Rom.SHA384Key] = string.Empty, @@ -1155,7 +1155,7 @@ namespace SabreTools.Data.Extensions.Test [Rom.MD5Key] = string.Empty, [Rom.RIPEMD128Key] = string.Empty, [Rom.RIPEMD160Key] = string.Empty, - [Rom.SHA1Key] = ZeroHash.SHA1Str, + [Rom.SHA1Key] = HashType.SHA1.ZeroString, [Rom.SHA256Key] = string.Empty, [Rom.SHA384Key] = string.Empty, [Rom.SHA512Key] = string.Empty, @@ -1178,7 +1178,7 @@ namespace SabreTools.Data.Extensions.Test [Rom.RIPEMD128Key] = string.Empty, [Rom.RIPEMD160Key] = string.Empty, [Rom.SHA1Key] = string.Empty, - [Rom.SHA256Key] = ZeroHash.SHA256Str, + [Rom.SHA256Key] = HashType.SHA256.ZeroString, [Rom.SHA384Key] = string.Empty, [Rom.SHA512Key] = string.Empty, [Rom.SpamSumKey] = string.Empty, @@ -1201,7 +1201,7 @@ namespace SabreTools.Data.Extensions.Test [Rom.RIPEMD160Key] = string.Empty, [Rom.SHA1Key] = string.Empty, [Rom.SHA256Key] = string.Empty, - [Rom.SHA384Key] = ZeroHash.SHA384Str, + [Rom.SHA384Key] = HashType.SHA384.ZeroString, [Rom.SHA512Key] = string.Empty, [Rom.SpamSumKey] = string.Empty, }; @@ -1224,7 +1224,7 @@ namespace SabreTools.Data.Extensions.Test [Rom.SHA1Key] = string.Empty, [Rom.SHA256Key] = string.Empty, [Rom.SHA384Key] = string.Empty, - [Rom.SHA512Key] = ZeroHash.SHA512Str, + [Rom.SHA512Key] = HashType.SHA512.ZeroString, [Rom.SpamSumKey] = string.Empty, }; @@ -1247,7 +1247,7 @@ namespace SabreTools.Data.Extensions.Test [Rom.SHA256Key] = string.Empty, [Rom.SHA384Key] = string.Empty, [Rom.SHA512Key] = string.Empty, - [Rom.SpamSumKey] = ZeroHash.SpamSumStr, + [Rom.SpamSumKey] = HashType.SpamSum.ZeroString, }; bool actual = self.HasZeroHash(); @@ -1259,17 +1259,17 @@ namespace SabreTools.Data.Extensions.Test { DictionaryBase self = new Rom { - [Rom.CRCKey] = ZeroHash.CRC32Str, - [Rom.MD2Key] = ZeroHash.GetString(HashType.MD2), - [Rom.MD4Key] = ZeroHash.GetString(HashType.MD4), - [Rom.MD5Key] = ZeroHash.MD5Str, - [Rom.RIPEMD128Key] = ZeroHash.GetString(HashType.RIPEMD128), - [Rom.RIPEMD160Key] = ZeroHash.GetString(HashType.RIPEMD160), - [Rom.SHA1Key] = ZeroHash.SHA1Str, - [Rom.SHA256Key] = ZeroHash.SHA256Str, - [Rom.SHA384Key] = ZeroHash.SHA384Str, - [Rom.SHA512Key] = ZeroHash.SHA512Str, - [Rom.SpamSumKey] = ZeroHash.SpamSumStr, + [Rom.CRCKey] = HashType.CRC32.ZeroString, + [Rom.MD2Key] = HashType.MD2.ZeroString, + [Rom.MD4Key] = HashType.MD4.ZeroString, + [Rom.MD5Key] = HashType.MD5.ZeroString, + [Rom.RIPEMD128Key] = HashType.RIPEMD128.ZeroString, + [Rom.RIPEMD160Key] = HashType.RIPEMD160.ZeroString, + [Rom.SHA1Key] = HashType.SHA1.ZeroString, + [Rom.SHA256Key] = HashType.SHA256.ZeroString, + [Rom.SHA384Key] = HashType.SHA384.ZeroString, + [Rom.SHA512Key] = HashType.SHA512.ZeroString, + [Rom.SpamSumKey] = HashType.SpamSum.ZeroString, }; bool actual = self.HasZeroHash(); diff --git a/SabreTools.Data.Extensions/MetadataExtensions.cs b/SabreTools.Data.Extensions/MetadataExtensions.cs index 10f30948..3e0dc7fb 100644 --- a/SabreTools.Data.Extensions/MetadataExtensions.cs +++ b/SabreTools.Data.Extensions/MetadataExtensions.cs @@ -579,10 +579,10 @@ namespace SabreTools.Data.Extensions private static bool HasZeroHash(this Disk disk) { string? md5 = disk.ReadString(Disk.MD5Key); - bool md5Null = string.IsNullOrEmpty(md5) || string.Equals(md5, ZeroHash.MD5Str, StringComparison.OrdinalIgnoreCase); + bool md5Null = string.IsNullOrEmpty(md5) || string.Equals(md5, HashType.MD5.ZeroString, StringComparison.OrdinalIgnoreCase); string? sha1 = disk.ReadString(Disk.SHA1Key); - bool sha1Null = string.IsNullOrEmpty(sha1) || string.Equals(sha1, ZeroHash.SHA1Str, StringComparison.OrdinalIgnoreCase); + bool sha1Null = string.IsNullOrEmpty(sha1) || string.Equals(sha1, HashType.SHA1.ZeroString, StringComparison.OrdinalIgnoreCase); return md5Null && sha1Null; @@ -594,16 +594,16 @@ namespace SabreTools.Data.Extensions private static bool HasZeroHash(this Media media) { string? md5 = media.ReadString(Media.MD5Key); - bool md5Null = string.IsNullOrEmpty(md5) || string.Equals(md5, ZeroHash.MD5Str, StringComparison.OrdinalIgnoreCase); + bool md5Null = string.IsNullOrEmpty(md5) || string.Equals(md5, HashType.MD5.ZeroString, StringComparison.OrdinalIgnoreCase); string? sha1 = media.ReadString(Media.SHA1Key); - bool sha1Null = string.IsNullOrEmpty(sha1) || string.Equals(sha1, ZeroHash.SHA1Str, StringComparison.OrdinalIgnoreCase); + bool sha1Null = string.IsNullOrEmpty(sha1) || string.Equals(sha1, HashType.SHA1.ZeroString, StringComparison.OrdinalIgnoreCase); string? sha256 = media.ReadString(Media.SHA256Key); - bool sha256Null = string.IsNullOrEmpty(sha256) || string.Equals(sha256, ZeroHash.SHA256Str, StringComparison.OrdinalIgnoreCase); + bool sha256Null = string.IsNullOrEmpty(sha256) || string.Equals(sha256, HashType.SHA256.ZeroString, StringComparison.OrdinalIgnoreCase); string? spamsum = media.ReadString(Media.SpamSumKey); - bool spamsumNull = string.IsNullOrEmpty(spamsum) || string.Equals(spamsum, ZeroHash.SpamSumStr, StringComparison.OrdinalIgnoreCase); + bool spamsumNull = string.IsNullOrEmpty(spamsum) || string.Equals(spamsum, HashType.SpamSum.ZeroString, StringComparison.OrdinalIgnoreCase); return md5Null && sha1Null @@ -617,37 +617,37 @@ namespace SabreTools.Data.Extensions private static bool HasZeroHash(this Rom rom) { string? crc = rom.ReadString(Rom.CRCKey); - bool crcNull = string.IsNullOrEmpty(crc) || string.Equals(crc, ZeroHash.CRC32Str, StringComparison.OrdinalIgnoreCase); + bool crcNull = string.IsNullOrEmpty(crc) || string.Equals(crc, HashType.CRC32.ZeroString, StringComparison.OrdinalIgnoreCase); string? md2 = rom.ReadString(Rom.MD2Key); - bool md2Null = string.IsNullOrEmpty(md2) || string.Equals(md2, ZeroHash.GetString(HashType.MD2), StringComparison.OrdinalIgnoreCase); + bool md2Null = string.IsNullOrEmpty(md2) || string.Equals(md2, HashType.MD2.ZeroString, StringComparison.OrdinalIgnoreCase); string? md4 = rom.ReadString(Rom.MD4Key); - bool md4Null = string.IsNullOrEmpty(md4) || string.Equals(md4, ZeroHash.GetString(HashType.MD4), StringComparison.OrdinalIgnoreCase); + bool md4Null = string.IsNullOrEmpty(md4) || string.Equals(md4, HashType.MD4.ZeroString, StringComparison.OrdinalIgnoreCase); string? md5 = rom.ReadString(Rom.MD5Key); - bool md5Null = string.IsNullOrEmpty(md5) || string.Equals(md5, ZeroHash.MD5Str, StringComparison.OrdinalIgnoreCase); + bool md5Null = string.IsNullOrEmpty(md5) || string.Equals(md5, HashType.MD5.ZeroString, StringComparison.OrdinalIgnoreCase); string? ripeMD128 = rom.ReadString(Rom.RIPEMD128Key); - bool ripeMD128Null = string.IsNullOrEmpty(value: ripeMD128) || string.Equals(ripeMD128, ZeroHash.GetString(HashType.RIPEMD128), StringComparison.OrdinalIgnoreCase); + bool ripeMD128Null = string.IsNullOrEmpty(value: ripeMD128) || string.Equals(ripeMD128, HashType.RIPEMD128.ZeroString, StringComparison.OrdinalIgnoreCase); string? ripeMD160 = rom.ReadString(Rom.RIPEMD160Key); - bool ripeMD160Null = string.IsNullOrEmpty(ripeMD160) || string.Equals(ripeMD160, ZeroHash.GetString(HashType.RIPEMD160), StringComparison.OrdinalIgnoreCase); + bool ripeMD160Null = string.IsNullOrEmpty(ripeMD160) || string.Equals(ripeMD160, HashType.RIPEMD160.ZeroString, StringComparison.OrdinalIgnoreCase); string? sha1 = rom.ReadString(Rom.SHA1Key); - bool sha1Null = string.IsNullOrEmpty(sha1) || string.Equals(sha1, ZeroHash.SHA1Str, StringComparison.OrdinalIgnoreCase); + bool sha1Null = string.IsNullOrEmpty(sha1) || string.Equals(sha1, HashType.SHA1.ZeroString, StringComparison.OrdinalIgnoreCase); string? sha256 = rom.ReadString(Rom.SHA256Key); - bool sha256Null = string.IsNullOrEmpty(sha256) || string.Equals(sha256, ZeroHash.SHA256Str, StringComparison.OrdinalIgnoreCase); + bool sha256Null = string.IsNullOrEmpty(sha256) || string.Equals(sha256, HashType.SHA256.ZeroString, StringComparison.OrdinalIgnoreCase); string? sha384 = rom.ReadString(Rom.SHA384Key); - bool sha384Null = string.IsNullOrEmpty(sha384) || string.Equals(sha384, ZeroHash.SHA384Str, StringComparison.OrdinalIgnoreCase); + bool sha384Null = string.IsNullOrEmpty(sha384) || string.Equals(sha384, HashType.SHA384.ZeroString, StringComparison.OrdinalIgnoreCase); string? sha512 = rom.ReadString(Rom.SHA512Key); - bool sha512Null = string.IsNullOrEmpty(sha512) || string.Equals(sha512, ZeroHash.SHA512Str, StringComparison.OrdinalIgnoreCase); + bool sha512Null = string.IsNullOrEmpty(sha512) || string.Equals(sha512, HashType.SHA512.ZeroString, StringComparison.OrdinalIgnoreCase); string? spamsum = rom.ReadString(Rom.SpamSumKey); - bool spamsumNull = string.IsNullOrEmpty(spamsum) || string.Equals(spamsum, ZeroHash.SpamSumStr, StringComparison.OrdinalIgnoreCase); + bool spamsumNull = string.IsNullOrEmpty(spamsum) || string.Equals(spamsum, HashType.SpamSum.ZeroString, StringComparison.OrdinalIgnoreCase); return crcNull && md2Null diff --git a/SabreTools.Data.Extensions/SabreTools.Data.Extensions.csproj b/SabreTools.Data.Extensions/SabreTools.Data.Extensions.csproj index 01a40805..ff65f64f 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 132d7c33..4fbbb860 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.Serialization.CrossModel.Test/SabreTools.Serialization.CrossModel.Test.csproj b/SabreTools.Serialization.CrossModel.Test/SabreTools.Serialization.CrossModel.Test.csproj index e4d76db5..4b272ff6 100644 --- a/SabreTools.Serialization.CrossModel.Test/SabreTools.Serialization.CrossModel.Test.csproj +++ b/SabreTools.Serialization.CrossModel.Test/SabreTools.Serialization.CrossModel.Test.csproj @@ -10,7 +10,7 @@ - + diff --git a/SabreTools.Serialization.CrossModel/SabreTools.Serialization.CrossModel.csproj b/SabreTools.Serialization.CrossModel/SabreTools.Serialization.CrossModel.csproj index ba30188e..7157bcd8 100644 --- a/SabreTools.Serialization.CrossModel/SabreTools.Serialization.CrossModel.csproj +++ b/SabreTools.Serialization.CrossModel/SabreTools.Serialization.CrossModel.csproj @@ -31,8 +31,8 @@ - - + + diff --git a/SabreTools.Serialization.Readers.Test/ListromTests.cs b/SabreTools.Serialization.Readers.Test/ListromTests.cs index fb20b94e..92d28f02 100644 --- a/SabreTools.Serialization.Readers.Test/ListromTests.cs +++ b/SabreTools.Serialization.Readers.Test/ListromTests.cs @@ -105,8 +105,8 @@ namespace SabreTools.Serialization.Readers.Test Name = "XXXXXX", Size = "12345", Bad = false, - CRC = Hashing.ZeroHash.CRC32Str, - SHA1 = Hashing.ZeroHash.SHA1Str, + CRC = Hashing.HashType.CRC32.ZeroString, + SHA1 = Hashing.HashType.SHA1.ZeroString, NoGoodDumpKnown = false, }; @@ -115,8 +115,8 @@ namespace SabreTools.Serialization.Readers.Test Name = "XXXXXX", Size = "12345", Bad = true, - CRC = Hashing.ZeroHash.CRC32Str, - SHA1 = Hashing.ZeroHash.SHA1Str, + CRC = Hashing.HashType.CRC32.ZeroString, + SHA1 = Hashing.HashType.SHA1.ZeroString, NoGoodDumpKnown = false, }; @@ -124,7 +124,7 @@ namespace SabreTools.Serialization.Readers.Test { Name = "XXXXXX", Bad = false, - MD5 = Hashing.ZeroHash.MD5Str, + MD5 = Hashing.HashType.MD5.ZeroString, SHA1 = null, NoGoodDumpKnown = false, }; @@ -134,7 +134,7 @@ namespace SabreTools.Serialization.Readers.Test Name = "XXXXXX", Bad = false, MD5 = null, - SHA1 = Hashing.ZeroHash.SHA1Str, + SHA1 = Hashing.HashType.SHA1.ZeroString, NoGoodDumpKnown = false, }; @@ -142,8 +142,8 @@ namespace SabreTools.Serialization.Readers.Test { Name = "XXXXXX", Bad = false, - MD5 = Hashing.ZeroHash.MD5Str, - SHA1 = Hashing.ZeroHash.SHA1Str, + MD5 = Hashing.HashType.MD5.ZeroString, + SHA1 = Hashing.HashType.SHA1.ZeroString, NoGoodDumpKnown = true, }; @@ -205,8 +205,8 @@ namespace SabreTools.Serialization.Readers.Test Assert.Equal("XXXXXX", row.Name); Assert.Equal("12345", row.Size); Assert.False(row.Bad); - Assert.Equal(Hashing.ZeroHash.CRC32Str, row.CRC); - Assert.Equal(Hashing.ZeroHash.SHA1Str, row.SHA1); + Assert.Equal(Hashing.HashType.CRC32.ZeroString, row.CRC); + Assert.Equal(Hashing.HashType.SHA1.ZeroString, row.SHA1); Assert.False(row.NoGoodDumpKnown); } @@ -219,8 +219,8 @@ namespace SabreTools.Serialization.Readers.Test Assert.Equal("XXXXXX", row.Name); Assert.Equal("12345", row.Size); Assert.True(row.Bad); - Assert.Equal(Hashing.ZeroHash.CRC32Str, row.CRC); - Assert.Equal(Hashing.ZeroHash.SHA1Str, row.SHA1); + Assert.Equal(Hashing.HashType.CRC32.ZeroString, row.CRC); + Assert.Equal(Hashing.HashType.SHA1.ZeroString, row.SHA1); Assert.False(row.NoGoodDumpKnown); } @@ -232,7 +232,7 @@ namespace SabreTools.Serialization.Readers.Test Assert.NotNull(row); Assert.Equal("XXXXXX", row.Name); Assert.False(row.Bad); - Assert.Equal(Hashing.ZeroHash.MD5Str, row.MD5); + Assert.Equal(Hashing.HashType.MD5.ZeroString, row.MD5); Assert.Null(row.SHA1); Assert.False(row.NoGoodDumpKnown); } @@ -246,7 +246,7 @@ namespace SabreTools.Serialization.Readers.Test Assert.Equal("XXXXXX", row.Name); Assert.False(row.Bad); Assert.Null(row.MD5); - Assert.Equal(Hashing.ZeroHash.SHA1Str, row.SHA1); + Assert.Equal(Hashing.HashType.SHA1.ZeroString, row.SHA1); Assert.False(row.NoGoodDumpKnown); } diff --git a/SabreTools.Serialization.Readers/SabreTools.Serialization.Readers.csproj b/SabreTools.Serialization.Readers/SabreTools.Serialization.Readers.csproj index 8cf2b1af..ce5dc9bf 100644 --- a/SabreTools.Serialization.Readers/SabreTools.Serialization.Readers.csproj +++ b/SabreTools.Serialization.Readers/SabreTools.Serialization.Readers.csproj @@ -36,8 +36,8 @@ - - + + diff --git a/SabreTools.Serialization.Writers/SabreTools.Serialization.Writers.csproj b/SabreTools.Serialization.Writers/SabreTools.Serialization.Writers.csproj index d2852b99..22e2b91c 100644 --- a/SabreTools.Serialization.Writers/SabreTools.Serialization.Writers.csproj +++ b/SabreTools.Serialization.Writers/SabreTools.Serialization.Writers.csproj @@ -32,8 +32,8 @@ - - + + diff --git a/SabreTools.Serialization/SabreTools.Serialization.csproj b/SabreTools.Serialization/SabreTools.Serialization.csproj index bc4f7cba..fa64e931 100644 --- a/SabreTools.Serialization/SabreTools.Serialization.csproj +++ b/SabreTools.Serialization/SabreTools.Serialization.csproj @@ -41,6 +41,10 @@ + + + + @@ -52,10 +56,11 @@ + - - + + \ No newline at end of file diff --git a/SabreTools.Wrappers/SabreTools.Wrappers.csproj b/SabreTools.Wrappers/SabreTools.Wrappers.csproj index 87af7437..5d0ad834 100644 --- a/SabreTools.Wrappers/SabreTools.Wrappers.csproj +++ b/SabreTools.Wrappers/SabreTools.Wrappers.csproj @@ -42,8 +42,8 @@ - - + +