Update Models to 1.5.6

Author: mnadareski

SabreTools.Serialization.Test/CrossModel/DosCenterTests.cs

@@ -49,6 +49,7 @@ private static Models.DosCenter.MetadataFile Build()
                 Name = "XXXXXX",
                 Size = "XXXXXX",
                 CRC = "XXXXXX",
+                SHA1 = "XXXXXX",
                 Date = "XXXXXX",
             };
 
@@ -102,6 +103,7 @@ private static void Validate(Models.DosCenter.File? rom)
             Assert.Equal("XXXXXX", rom.Name);
             Assert.Equal("XXXXXX", rom.Size);
             Assert.Equal("XXXXXX", rom.CRC);
+            Assert.Equal("XXXXXX", rom.SHA1);
             Assert.Equal("XXXXXX", rom.Date);
         }
     }

SabreTools.Serialization.Test/Deserializers/DosCenterTests.cs

@@ -117,6 +117,7 @@ private static Models.DosCenter.MetadataFile Build()
                 Name = "XXXXXX",
                 Size = "XXXXXX",
                 CRC = "XXXXXX",
+                SHA1 = "XXXXXX",
                 Date = "XXXXXX XXXXXX",
             };
 
@@ -170,6 +171,7 @@ private static void Validate(Models.DosCenter.File? rom)
             Assert.Equal("XXXXXX", rom.Name);
             Assert.Equal("XXXXXX", rom.Size);
             Assert.Equal("XXXXXX", rom.CRC);
+            Assert.Equal("XXXXXX", rom.SHA1);
             Assert.Equal("XXXXXX XXXXXX", rom.Date);
         }
     }

SabreTools.Serialization.Test/SabreTools.Serialization.Test.csproj

@@ -28,7 +28,7 @@
         </PackageReference>
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
         <PackageReference Include="SabreTools.Hashing" Version="1.4.0" />
-        <PackageReference Include="SabreTools.Models" Version="1.5.5" />
+        <PackageReference Include="SabreTools.Models" Version="1.5.6" />
         <PackageReference Include="xunit" Version="2.9.2" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

SabreTools.Serialization/CrossModel/DosCenter.Deserializer.cs

@@ -70,6 +70,7 @@ private static File ConvertFromInternalModel(Models.Metadata.Rom item)
                 Name = item.ReadString(Models.Metadata.Rom.NameKey),
                 Size = item.ReadString(Models.Metadata.Rom.SizeKey),
                 CRC = item.ReadString(Models.Metadata.Rom.CRCKey),
+                SHA1 = item.ReadString(Models.Metadata.Rom.SHA1Key),
                 Date = item.ReadString(Models.Metadata.Rom.DateKey),
             };
             return file;

SabreTools.Serialization/CrossModel/DosCenter.Serializer.cs

@@ -73,6 +73,7 @@ private static Models.Metadata.Rom ConvertToInternalModel(File item)
                 [Models.Metadata.Rom.NameKey] = item.Name,
                 [Models.Metadata.Rom.SizeKey] = item.Size,
                 [Models.Metadata.Rom.CRCKey] = item.CRC,
+                [Models.Metadata.Rom.SHA1Key] = item.SHA1,
                 [Models.Metadata.Rom.DateKey] = item.Date,
             };
             return rom;

SabreTools.Serialization/Deserializers/ClrMamePro.cs

@@ -179,7 +179,7 @@ public class ClrMamePro : BaseBinaryDeserializer<MetadataFile>
                         }
                     }
 
-                    // If we're in the doscenter block
+                    // If we're in the clrmamepro block
                     else if (reader.TopLevel == "clrmamepro"
                         && reader.RowType == CmpRowType.Standalone)
                     {

SabreTools.Serialization/Deserializers/DosCenter.cs

@@ -172,6 +172,9 @@ public class DosCenter : BaseBinaryDeserializer<MetadataFile>
                     case "crc":
                         file.CRC = kvp.Value;
                         break;
+                    case "sha1":
+                        file.SHA1 = kvp.Value;
+                        break;
                     case "date":
                         file.Date = kvp.Value;
                         break;

SabreTools.Serialization/SabreTools.Serialization.csproj

@@ -33,7 +33,7 @@
         <PackageReference Include="SabreTools.ASN1" Version="1.5.0" />
         <PackageReference Include="SabreTools.Hashing" Version="1.4.0" />
         <PackageReference Include="SabreTools.IO" Version="1.6.1" />
-        <PackageReference Include="SabreTools.Models" Version="1.5.5" />
+        <PackageReference Include="SabreTools.Models" Version="1.5.6" />
     </ItemGroup>
 
 </Project>

SabreTools.Serialization/Serializers/DosCenter.cs

@@ -117,6 +117,7 @@ private static void WriteFiles(Models.DosCenter.File[]? files, ClrMameProWriter
                 writer.WriteRequiredAttributeString("size", file.Size, throwOnError: true);
                 writer.WriteOptionalAttributeString("date", file.Date);
                 writer.WriteRequiredAttributeString("crc", file.CRC?.ToUpperInvariant(), throwOnError: true);
+                writer.WriteRequiredAttributeString("sha1", file.SHA1?.ToUpperInvariant());
 
                 writer.WriteEndElement(); // file
             }