Bump version

RedumpTool/RedumpTool.csproj

@@ -9,7 +9,7 @@
         <Nullable>enable</Nullable>
         <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-        <Version>1.7.3</Version>
+        <Version>1.7.5</Version>
     </PropertyGroup>
 
     <!-- Support All Frameworks -->
@@ -30,4 +30,4 @@
         <ProjectReference Include="..\SabreTools.RedumpLib\SabreTools.RedumpLib.csproj" />
     </ItemGroup>
 
-</Project>
+</Project>

SabreTools.RedumpLib.Test/Data/ExtensionsTests.cs

@@ -720,6 +720,7 @@ namespace SabreTools.RedumpLib.Test.Data
             SiteCode.Series,
             SiteCode.SSHash,
             SiteCode.SSVersion,
+            SiteCode.TitleID,
             SiteCode.UniversalHash,
             SiteCode.VCD,
             SiteCode.VFCCode,

SabreTools.RedumpLib.Test/FormatterTests.cs

@@ -556,7 +556,7 @@ namespace SabreTools.RedumpLib.Test
             string? expected = "BD-ROM-66";
 
             MediaType? mediaType = MediaType.BluRay;
-            string? picIdentifier = Models.PIC.Constants.DiscTypeIdentifierROMUltra;
+            string? picIdentifier = "BDU";
             long? size = null;
             long? layerbreak = 12345;
             long? layerbreak2 = null;
@@ -622,7 +622,7 @@ namespace SabreTools.RedumpLib.Test
             string? expected = "BD-ROM-33";
 
             MediaType? mediaType = MediaType.BluRay;
-            string? picIdentifier = Models.PIC.Constants.DiscTypeIdentifierROMUltra;
+            string? picIdentifier = "BDU";
             long? size = null;
             long? layerbreak = null;
             long? layerbreak2 = null;

SabreTools.RedumpLib.Test/SabreTools.RedumpLib.Test.csproj

@@ -24,8 +24,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.CodeCoverage" Version="17.14.1" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
+        <PackageReference Include="Microsoft.CodeCoverage" Version="18.0.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
         <PackageReference Include="xunit" Version="2.9.3" />
         <PackageReference Include="xunit.abstractions" Version="2.0.3" />
         <PackageReference Include="xunit.analyzers" Version="1.24.0" />
@@ -37,7 +37,7 @@
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="xunit.runner.visualstudio" Version="3.1.4">
+        <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

SabreTools.RedumpLib.Test/ValidatorTests.cs

@@ -143,7 +143,7 @@ namespace SabreTools.RedumpLib.Test
                 SizeAndChecksums = new SizeAndChecksumsSection
                 {
                     Layerbreak = 12345,
-                    PICIdentifier = Models.PIC.Constants.DiscTypeIdentifierROMUltra,
+                    PICIdentifier = "BDU",
                 },
             };
 
@@ -213,7 +213,7 @@ namespace SabreTools.RedumpLib.Test
                 CommonDiscInfo = new CommonDiscInfoSection { Media = type },
                 SizeAndChecksums = new SizeAndChecksumsSection
                 {
-                    PICIdentifier = Models.PIC.Constants.DiscTypeIdentifierROMUltra,
+                    PICIdentifier = "BDU",
                 },
             };
 

SabreTools.RedumpLib/Builder.cs

@@ -733,6 +733,7 @@ namespace SabreTools.RedumpLib
 
                 // Microsoft Xbox One and Series X/S
                 SiteCode.Filename => true,
+                SiteCode.TitleID => true,
 
                 // Nintendo Gamecube
                 SiteCode.InternalName => true,

SabreTools.RedumpLib/Data/Enumerations.cs

@@ -3731,6 +3731,10 @@ namespace SabreTools.RedumpLib.Data
         [HumanReadable(ShortName = "[T:TD]", LongName = "<b>Tech Demos</b>:")]
         TechDemos,
 
+        // This doesn't have a site tag yet
+        [HumanReadable(ShortName = "<b>Title ID</b>:", LongName = "<b>Title ID</b>:")]
+        TitleID,
+
         [HumanReadable(ShortName = "[T:UID]", LongName = "<b>Ubisoft ID</b>:")]
         UbisoftID,
 

SabreTools.RedumpLib/Data/Extensions.cs

@@ -1277,6 +1277,7 @@ namespace SabreTools.RedumpLib.Data
                 SiteCode.Series => true,
                 SiteCode.SSHash => true,
                 SiteCode.SSVersion => true,
+                SiteCode.TitleID => true,
                 SiteCode.UniversalHash => true,
                 SiteCode.VCD => true,
                 SiteCode.VFCCode => true,

SabreTools.RedumpLib/Formatter.cs

@@ -38,6 +38,7 @@ namespace SabreTools.RedumpLib
             SiteCode.SSVersion,
 
             SiteCode.Filename,
+            SiteCode.TitleID,
 
             SiteCode.Protection,
 
@@ -687,13 +688,13 @@ namespace SabreTools.RedumpLib
                         return $"{mediaType.LongName()}-128";
                     else if (layerbreak2 != default && layerbreak2 != default(long))
                         return $"{mediaType.LongName()}-100";
-                    else if (layerbreak != default && layerbreak != default(long) && picIdentifier == Models.PIC.Constants.DiscTypeIdentifierROMUltra)
+                    else if (layerbreak != default && layerbreak != default(long) && picIdentifier == "BDU")
                         return $"{mediaType.LongName()}-66";
                     else if (layerbreak != default && layerbreak != default(long) && size > 53_687_063_712)
                         return $"{mediaType.LongName()}-66";
                     else if (layerbreak != default && layerbreak != default(long))
                         return $"{mediaType.LongName()}-50";
-                    else if (picIdentifier == Models.PIC.Constants.DiscTypeIdentifierROMUltra)
+                    else if (picIdentifier == "BDU")
                         return $"{mediaType.LongName()}-33";
                     else if (size > 26_843_531_856)
                         return $"{mediaType.LongName()}-33";

SabreTools.RedumpLib/SabreTools.RedumpLib.csproj

@@ -8,7 +8,7 @@
         <Nullable>enable</Nullable>
         <SymbolPackageFormat>snupkg</SymbolPackageFormat>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-        <Version>1.7.3</Version>
+        <Version>1.7.5</Version>
 
         <!-- Package Properties -->
         <Authors>Matt Nadareski</Authors>
@@ -34,7 +34,6 @@
         <PackageReference Include="MinAsyncBridge" Version="0.12.4" Condition="$(TargetFramework.StartsWith(`net2`)) OR $(TargetFramework.StartsWith(`net3`)) OR $(TargetFramework.StartsWith(`net40`))" />
         <PackageReference Include="Net35.Actions" Version="1.4.0" Condition="$(TargetFramework.StartsWith(`net2`))" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
-        <PackageReference Include="SabreTools.Models" Version="1.7.2" />
     </ItemGroup>
 
-</Project>
+</Project>

SabreTools.RedumpLib/Validator.cs

@@ -39,13 +39,13 @@ namespace SabreTools.RedumpLib
                         info.CommonDiscInfo.Media = DiscType.BD128;
                     else if (info.SizeAndChecksums.Layerbreak2 != default)
                         info.CommonDiscInfo.Media = DiscType.BD100;
-                    else if (info.SizeAndChecksums.Layerbreak != default && info.SizeAndChecksums.PICIdentifier == Models.PIC.Constants.DiscTypeIdentifierROMUltra)
+                    else if (info.SizeAndChecksums.Layerbreak != default && info.SizeAndChecksums.PICIdentifier == "BDU")
                         info.CommonDiscInfo.Media = DiscType.BD66;
                     else if (info.SizeAndChecksums.Layerbreak != default && info.SizeAndChecksums.Size > 50_050_629_632)
                         info.CommonDiscInfo.Media = DiscType.BD66;
                     else if (info.SizeAndChecksums.Layerbreak != default)
                         info.CommonDiscInfo.Media = DiscType.BD50;
-                    else if (info.SizeAndChecksums.PICIdentifier == Models.PIC.Constants.DiscTypeIdentifierROMUltra)
+                    else if (info.SizeAndChecksums.PICIdentifier == "BDU")
                         info.CommonDiscInfo.Media = DiscType.BD33;
                     else if (info.SizeAndChecksums.Size > 25_025_314_816)
                         info.CommonDiscInfo.Media = DiscType.BD33;
@@ -157,7 +157,6 @@ namespace SabreTools.RedumpLib
         /// </summary>
         /// <param name="rc">RedumpClient for making the connection</param>
         /// <param name="info">Existing SubmissionInfo object to fill</param>
-        /// <param name="resultProgress">Optional result progress callback</param>
         /// <returns>List of found values, if possible</returns>
         public async static Task<List<int>?> ValidateUniversalHash(RedumpClient rc, SubmissionInfo info)
         {