Bump version

* Remove obsolete PhilipsCDiDigitalVideo system

* Delete obsolete system

.github/workflows/build_and_test.yml

@@ -25,13 +25,7 @@ jobs:
       run: dotnet test
       
     - name: Run publish script
-      run: ./publish-nix.sh
-
-    - name: Upload build
-      uses: actions/upload-artifact@v4
-      with:
-        name: 'Nuget Package'
-        path: "*.nupkg,*.snupkg"
+      run: ./publish-nix.sh -d
 
     - name: Upload to rolling
       uses: ncipollo/release-action@v1.14.0

RedumpTool/RedumpTool.csproj

@@ -9,7 +9,7 @@
         <Nullable>enable</Nullable>
         <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-        <Version>1.6.3</Version>
+        <Version>1.6.5</Version>
     </PropertyGroup>
 
     <!-- Support All Frameworks -->

SabreTools.RedumpLib.Test/Data/ExtensionsTests.cs

@@ -710,6 +710,7 @@ namespace SabreTools.RedumpLib.Test.Data
             SiteCode.PPN,
             SiteCode.Protection,
             SiteCode.RingNonZeroDataStart,
+            SiteCode.RingPerfectAudioOffset,
             SiteCode.Series,
             SiteCode.SSHash,
             SiteCode.SSVersion,
@@ -1023,7 +1024,6 @@ namespace SabreTools.RedumpLib.Test.Data
             RedumpSystem.NintendoWiiU,
             RedumpSystem.Panasonic3DOInteractiveMultiplayer,
             RedumpSystem.PhilipsCDi,
-            RedumpSystem.PhilipsCDiDigitalVideo,
             RedumpSystem.SegaDreamcast,
             RedumpSystem.SegaMegaCDSegaCD,
             RedumpSystem.SegaSaturn,
@@ -1100,7 +1100,6 @@ namespace SabreTools.RedumpLib.Test.Data
             RedumpSystem.MicrosoftXboxOne,
             RedumpSystem.MicrosoftXboxSeriesXS,
             RedumpSystem.NintendoWiiU,
-            RedumpSystem.PhilipsCDiDigitalVideo,
             RedumpSystem.SonyPlayStation4,
             RedumpSystem.SonyPlayStation5,
 
@@ -1180,7 +1179,6 @@ namespace SabreTools.RedumpLib.Test.Data
             [RedumpSystem.NintendoWiiU] = SystemCategory.DiscBasedConsole,
             [RedumpSystem.Panasonic3DOInteractiveMultiplayer] = SystemCategory.DiscBasedConsole,
             [RedumpSystem.PhilipsCDi] = SystemCategory.DiscBasedConsole,
-            [RedumpSystem.PhilipsCDiDigitalVideo] = SystemCategory.DiscBasedConsole,
             [RedumpSystem.PioneerLaserActive] = SystemCategory.DiscBasedConsole,
             [RedumpSystem.SegaDreamcast] = SystemCategory.DiscBasedConsole,
             [RedumpSystem.SegaMegaCDSegaCD] = SystemCategory.DiscBasedConsole,

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

@@ -24,20 +24,20 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.CodeCoverage" Version="17.12.0" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
-        <PackageReference Include="xunit" Version="2.9.2" />
+        <PackageReference Include="Microsoft.CodeCoverage" Version="17.13.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+        <PackageReference Include="xunit" Version="2.9.3" />
         <PackageReference Include="xunit.abstractions" Version="2.0.3" />
-        <PackageReference Include="xunit.analyzers" Version="1.17.0" />
-        <PackageReference Include="xunit.assert" Version="2.9.2" />
-        <PackageReference Include="xunit.core" Version="2.9.2" />
-        <PackageReference Include="xunit.extensibility.core" Version="2.9.2" />
-        <PackageReference Include="xunit.extensibility.execution" Version="2.9.2" />
-        <PackageReference Include="xunit.runner.console" Version="2.9.2">
+        <PackageReference Include="xunit.analyzers" Version="1.20.0" />
+        <PackageReference Include="xunit.assert" Version="2.9.3" />
+        <PackageReference Include="xunit.core" Version="2.9.3" />
+        <PackageReference Include="xunit.extensibility.core" Version="2.9.3" />
+        <PackageReference Include="xunit.extensibility.execution" Version="2.9.3" />
+        <PackageReference Include="xunit.runner.console" Version="2.9.3">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
+        <PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

SabreTools.RedumpLib/Builder.cs

@@ -468,6 +468,7 @@ namespace SabreTools.RedumpLib
 
                                 // Audio CD
                                 case SiteCode.RingNonZeroDataStart:
+                                case SiteCode.RingPerfectAudioOffset:
                                 case SiteCode.UniversalHash:
                                     continue;
 

SabreTools.RedumpLib/Data/Enumerations.cs

@@ -2008,9 +2008,6 @@ namespace SabreTools.RedumpLib.Data
         [System(Category = SystemCategory.DiscBasedConsole, LongName = "Philips CD-i", ShortName = "cdi", HasCues = true, HasDat = true)]
         PhilipsCDi,
 
-        [System(Category = SystemCategory.DiscBasedConsole, LongName = "Philips CD-i Digital Video", ShortName = "cdi-video", IsBanned = true)]
-        PhilipsCDiDigitalVideo,
-
         [System(Category = SystemCategory.DiscBasedConsole, Available = false, LongName = "Pioneer LaserActive")]
         PioneerLaserActive,
 
@@ -3668,6 +3665,10 @@ namespace SabreTools.RedumpLib.Data
         [HumanReadable(ShortName = "<b>Ring non-zero data start</b>:", LongName = "<b>Ring non-zero data start</b>:")]
         RingNonZeroDataStart,
 
+        // This doesn't have a site tag yet
+        [HumanReadable(ShortName = "<b>Ring Perfect Audio Offset</b>:", LongName = "<b>Ring Perfect Audio Offset</b>:")]
+        RingPerfectAudioOffset,
+
         [HumanReadable(ShortName = "[T:RD]", LongName = "<b>Rolling Demos</b>:")]
         RollingDemos,
 

SabreTools.RedumpLib/Data/Extensions.cs

@@ -1261,6 +1261,7 @@ namespace SabreTools.RedumpLib.Data
                 SiteCode.PPN => true,
                 SiteCode.Protection => true,
                 SiteCode.RingNonZeroDataStart => true,
+                SiteCode.RingPerfectAudioOffset => true,
                 SiteCode.Series => true,
                 SiteCode.SSHash => true,
                 SiteCode.SSVersion => true,
@@ -1420,7 +1421,6 @@ namespace SabreTools.RedumpLib.Data
                     or RedumpSystem.NintendoWiiU
                     or RedumpSystem.Panasonic3DOInteractiveMultiplayer
                     or RedumpSystem.PhilipsCDi
-                    or RedumpSystem.PhilipsCDiDigitalVideo
                     or RedumpSystem.PioneerLaserActive
                     or RedumpSystem.MarkerDiscBasedConsoleEnd => false,
 

SabreTools.RedumpLib/Formatter.cs

@@ -22,6 +22,7 @@ namespace SabreTools.RedumpLib
             SiteCode.Multisession,
             SiteCode.UniversalHash,
             SiteCode.RingNonZeroDataStart,
+            SiteCode.RingPerfectAudioOffset,
 
             SiteCode.XMID,
             SiteCode.XeMID,

SabreTools.RedumpLib/SabreTools.RedumpLib.csproj

@@ -8,12 +8,12 @@
         <Nullable>enable</Nullable>
         <SymbolPackageFormat>snupkg</SymbolPackageFormat>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-        <Version>1.6.3</Version>
+        <Version>1.6.5</Version>
 
         <!-- Package Properties -->
         <Authors>Matt Nadareski</Authors>
         <Description>Code to interact with redump.org</Description>
-        <Copyright>Copyright (c) Matt Nadareski 2020-2024</Copyright>
+        <Copyright>Copyright (c) Matt Nadareski 2020-2025</Copyright>
         <PackageProjectUrl>https://github.com/SabreTools/</PackageProjectUrl>
         <PackageReadmeFile>README.md</PackageReadmeFile>
         <RepositoryUrl>https://github.com/SabreTools/SabreTools.RedumpLib</RepositoryUrl>
@@ -30,15 +30,9 @@
         <None Include="../README.md" Pack="true" PackagePath="" />
     </ItemGroup>
 
-    <!-- Support for old .NET versions -->
-    <ItemGroup Condition="$(TargetFramework.StartsWith(`net2`))">
-        <PackageReference Include="Net35.Actions" Version="1.1.0" />
-    </ItemGroup>
-    <ItemGroup Condition="$(TargetFramework.StartsWith(`net2`)) OR $(TargetFramework.StartsWith(`net3`)) OR $(TargetFramework.StartsWith(`net40`))">
-        <PackageReference Include="MinAsyncBridge" Version="0.12.4" />
-    </ItemGroup>
-
     <ItemGroup>
+        <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.1.0" Condition="$(TargetFramework.StartsWith(`net2`))" />
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
         <PackageReference Include="SabreTools.Models" Version="1.5.8" />
     </ItemGroup>

SabreTools.RedumpLib/Web/CookieWebClient.cs

@@ -32,7 +32,10 @@ namespace SabreTools.RedumpLib.Web
         {
             WebRequest request = base.GetWebRequest(address);
             if (request is HttpWebRequest webRequest)
+            {
+                webRequest.Timeout = 30 * 1000; // 30 seconds
                 webRequest.CookieContainer = _container;
+            }
 
             return request;
         }

SabreTools.RedumpLib/Web/RedumpClient.cs

@@ -52,7 +52,7 @@ namespace SabreTools.RedumpLib.Web
 #if NETFRAMEWORK
             _internalClient = new CookieWebClient();
 #else
-            _internalClient = new HttpClient(new HttpClientHandler { UseCookies = true });
+            _internalClient = new HttpClient(new HttpClientHandler { UseCookies = true }) { Timeout = TimeSpan.FromSeconds(30) };
 #endif
         }