Bump version

* Add Polymega system

* Polymega detected by windows

RedumpTool/RedumpTool.csproj

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

SabreTools.RedumpLib.Test/Data/ExtensionsTests.cs

@@ -703,6 +703,7 @@ namespace SabreTools.RedumpLib.Test.Data
             SiteCode.EditionNonLatin,
             SiteCode.Filename,
             SiteCode.Genre,
+            SiteCode.HighSierraVolumeDescriptor,
             SiteCode.InternalName,
             SiteCode.InternalSerialName,
             SiteCode.ISBN,
@@ -736,6 +737,7 @@ namespace SabreTools.RedumpLib.Test.Data
             SiteCode.ElectronicArtsID,
             SiteCode.FoxInteractiveID,
             SiteCode.GTInteractiveID,
+            SiteCode.InterplayID,
             SiteCode.JASRACID,
             SiteCode.KingRecordsID,
             SiteCode.KoeiID,
@@ -782,6 +784,7 @@ namespace SabreTools.RedumpLib.Test.Data
             SiteCode.Filename,
             SiteCode.Games,
             SiteCode.GameFootage,
+            SiteCode.HighSierraVolumeDescriptor,
             SiteCode.Multisession,
             SiteCode.NetYarozeGames,
             SiteCode.Patches,
@@ -1184,6 +1187,7 @@ namespace SabreTools.RedumpLib.Test.Data
             [RedumpSystem.NintendoWiiU] = SystemCategory.DiscBasedConsole,
             [RedumpSystem.Panasonic3DOInteractiveMultiplayer] = SystemCategory.DiscBasedConsole,
             [RedumpSystem.PhilipsCDi] = SystemCategory.DiscBasedConsole,
+            [RedumpSystem.PlaymajiPolymega] = SystemCategory.DiscBasedConsole,
             [RedumpSystem.PioneerLaserActive] = SystemCategory.DiscBasedConsole,
             [RedumpSystem.SegaDreamcast] = SystemCategory.DiscBasedConsole,
             [RedumpSystem.SegaMegaCDSegaCD] = SystemCategory.DiscBasedConsole,
@@ -1534,6 +1538,7 @@ namespace SabreTools.RedumpLib.Test.Data
             RedumpSystem.NECPCEngineCDTurboGrafxCD,
             RedumpSystem.NECPCFXPCFXGA,
             RedumpSystem.NintendoSonySuperNESCDROMSystem,
+            RedumpSystem.PlaymajiPolymega,
             RedumpSystem.SegaDreamcast,
             RedumpSystem.SegaMegaCDSegaCD,
             RedumpSystem.SegaSaturn,

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

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
+        <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
         <CheckEolTargetFramework>false</CheckEolTargetFramework>
         <LangVersion>latest</LangVersion>
         <Nullable>enable</Nullable>
@@ -24,11 +24,11 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.CodeCoverage" Version="17.13.0" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.0" />
+        <PackageReference Include="Microsoft.CodeCoverage" Version="17.14.1" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
         <PackageReference Include="xunit" Version="2.9.3" />
         <PackageReference Include="xunit.abstractions" Version="2.0.3" />
-        <PackageReference Include="xunit.analyzers" Version="1.21.0" />
+        <PackageReference Include="xunit.analyzers" Version="1.24.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" />
@@ -37,7 +37,7 @@
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
+        <PackageReference Include="xunit.runner.visualstudio" Version="3.1.4">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>

SabreTools.RedumpLib/Attributes/AttributeHelper.cs

@@ -44,4 +44,4 @@ namespace SabreTools.RedumpLib.Attributes
             return attributes[0] as HumanReadableAttribute;
         }
     }
-}
+}

SabreTools.RedumpLib/Attributes/HumanReadableAttribute.cs

@@ -22,4 +22,4 @@ namespace SabreTools.RedumpLib.Attributes
         /// </summary>
         public string? ShortName { get; set; }
     }
-}
+}

SabreTools.RedumpLib/Attributes/LanguageAttribute.cs

@@ -23,4 +23,4 @@ namespace SabreTools.RedumpLib.Attributes
         /// </summary>
         public string? ThreeLetterCodeAlt { get; set; }
     }
-}
+}

SabreTools.RedumpLib/Attributes/SystemAttribute.cs

@@ -52,4 +52,4 @@ namespace SabreTools.RedumpLib.Attributes
         /// </summary>
         public bool HasSbi { get; set; } = false;
     }
-}
+}

SabreTools.RedumpLib/Builder.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-#if NET40_OR_GREATER || NETCOREAPP
+#if NET40_OR_GREATER || NETCOREAPP || NETSTANDARD2_0_OR_GREATER
 using System.Net;
 #endif
 using System.Text;
@@ -713,7 +713,8 @@ namespace SabreTools.RedumpLib
             return siteCode switch
             {
                 // Multiple
-                SiteCode.InternalSerialName
+                SiteCode.HighSierraVolumeDescriptor
+                    or SiteCode.InternalSerialName
                     or SiteCode.Multisession
                     or SiteCode.VolumeLabel => true,
 

SabreTools.RedumpLib/Converters/DiscCategoryConverter.cs

@@ -33,4 +33,4 @@ namespace SabreTools.RedumpLib.Converters
             t.WriteTo(writer);
         }
     }
-}
+}

SabreTools.RedumpLib/Converters/DiscTypeConverter.cs

@@ -33,4 +33,4 @@ namespace SabreTools.RedumpLib.Converters
             t.WriteTo(writer);
         }
     }
-}
+}

SabreTools.RedumpLib/Converters/LanguageConverter.cs

@@ -18,7 +18,7 @@ namespace SabreTools.RedumpLib.Converters
             // If we have a value already, don't overwrite it
             if (hasExistingValue)
                 return existingValue ?? [];
-                
+
             // Get the current depth for checking
             int currentDepth = reader.Depth;
 
@@ -53,4 +53,4 @@ namespace SabreTools.RedumpLib.Converters
             array.WriteTo(writer);
         }
     }
-}
+}

SabreTools.RedumpLib/Converters/LanguageSelectionConverter.cs

@@ -18,7 +18,7 @@ namespace SabreTools.RedumpLib.Converters
             // If we have a value already, don't overwrite it
             if (hasExistingValue)
                 return existingValue ?? [];
-                
+
             // Get the current depth for checking
             int currentDepth = reader.Depth;
 
@@ -53,4 +53,4 @@ namespace SabreTools.RedumpLib.Converters
             array.WriteTo(writer);
         }
     }
-}
+}

SabreTools.RedumpLib/Converters/RegionConverter.cs

@@ -33,4 +33,4 @@ namespace SabreTools.RedumpLib.Converters
             t.WriteTo(writer);
         }
     }
-}
+}

SabreTools.RedumpLib/Converters/SystemConverter.cs

@@ -33,4 +33,4 @@ namespace SabreTools.RedumpLib.Converters
             t.WriteTo(writer);
         }
     }
-}
+}

SabreTools.RedumpLib/Converters/YesNoConverter.cs

@@ -33,4 +33,4 @@ namespace SabreTools.RedumpLib.Converters
             t.WriteTo(writer);
         }
     }
-}
+}

SabreTools.RedumpLib/Data/Constants.cs

@@ -306,4 +306,4 @@ namespace SabreTools.RedumpLib.Data
 
         #endregion
     }
-}
+}

SabreTools.RedumpLib/Data/Enumerations.cs

@@ -2008,6 +2008,9 @@ namespace SabreTools.RedumpLib.Data
         [System(Category = SystemCategory.DiscBasedConsole, LongName = "Philips CD-i", ShortName = "cdi", HasCues = true, HasDat = true)]
         PhilipsCDi,
 
+        [System(Category = SystemCategory.DiscBasedConsole, Available = false, LongName = "Playmaji Polymega")]
+        PlaymajiPolymega,
+
         [System(Category = SystemCategory.DiscBasedConsole, Available = false, LongName = "Pioneer LaserActive")]
         PioneerLaserActive,
 
@@ -3595,6 +3598,10 @@ namespace SabreTools.RedumpLib.Data
         [HumanReadable(ShortName = "[T:GTID]", LongName = "<b>GT Interactive ID</b>:")]
         GTInteractiveID,
 
+        // This doesn't have a site tag yet
+        [HumanReadable(ShortName = "<b>High Sierra Volume Descriptor</b>:", LongName = "<b>High Sierra Volume Descriptor</b>:")]
+        HighSierraVolumeDescriptor,
+
         // This doesn't have a site tag yet
         [HumanReadable(ShortName = "<b>Internal Name</b>:", LongName = "<b>Internal Name</b>:")]
         InternalName,
@@ -3602,6 +3609,10 @@ namespace SabreTools.RedumpLib.Data
         [HumanReadable(ShortName = "[T:ISN]", LongName = "<b>Internal Serial</b>:")]
         InternalSerialName,
 
+        // This doesn't have a site tag yet
+        [HumanReadable(ShortName = "<b>Interplay ID</b>:", LongName = "<b>Interplay ID</b>:")]
+        InterplayID,
+
         [HumanReadable(ShortName = "[T:ISBN]", LongName = "<b>ISBN</b>:")]
         ISBN,
 

SabreTools.RedumpLib/Data/Extensions.cs

@@ -159,6 +159,12 @@ namespace SabreTools.RedumpLib.Data
                     types.Add(MediaType.CDROM);
                     break;
 
+                // https://en.wikipedia.org/wiki/Polymega
+                case RedumpSystem.PlaymajiPolymega:
+                    types.Add(MediaType.CDROM);
+                    types.Add(MediaType.DVD);
+                    break;
+
                 // https://en.wikipedia.org/wiki/LaserActive
                 case RedumpSystem.PioneerLaserActive:
                     types.Add(MediaType.CDROM);
@@ -1254,6 +1260,7 @@ namespace SabreTools.RedumpLib.Data
                 SiteCode.EditionNonLatin => true,
                 SiteCode.Filename => true,
                 SiteCode.Genre => true,
+                SiteCode.HighSierraVolumeDescriptor => true,
                 SiteCode.InternalName => true,
                 SiteCode.InternalSerialName => true,
                 SiteCode.ISBN => true,
@@ -1287,6 +1294,7 @@ namespace SabreTools.RedumpLib.Data
                 SiteCode.ElectronicArtsID => true,
                 SiteCode.FoxInteractiveID => true,
                 SiteCode.GTInteractiveID => true,
+                SiteCode.InterplayID => true,
                 SiteCode.JASRACID => true,
                 SiteCode.KingRecordsID => true,
                 SiteCode.KoeiID => true,
@@ -1358,6 +1366,7 @@ namespace SabreTools.RedumpLib.Data
                 SiteCode.Filename => true,
                 SiteCode.Games => true,
                 SiteCode.GameFootage => true,
+                SiteCode.HighSierraVolumeDescriptor => true,
                 SiteCode.Multisession => true,
                 SiteCode.NetYarozeGames => true,
                 SiteCode.Patches => true,

SabreTools.RedumpLib/Data/SubmissionInfo.cs

@@ -1,8 +1,5 @@
 using System;
 using System.Collections.Generic;
-#if NET40_OR_GREATER || NETCOREAPP
-using System.Linq;
-#endif
 using Newtonsoft.Json;
 using SabreTools.RedumpLib.Converters;
 
@@ -75,7 +72,6 @@ namespace SabreTools.RedumpLib.Data
 
         public object Clone()
         {
-#if NET20 || NET35
             Dictionary<string, string>? artifacts = null;
             if (this.Artifacts != null)
             {
@@ -85,9 +81,6 @@ namespace SabreTools.RedumpLib.Data
                     artifacts[kvp.Key] = kvp.Value;
                 }
             }
-#else
-            var artifacts = this.Artifacts?.ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
-#endif
 
             return new SubmissionInfo
             {
@@ -249,7 +242,6 @@ namespace SabreTools.RedumpLib.Data
 
         public object Clone()
         {
-#if NET20 || NET35
             Dictionary<SiteCode, string>? commentsSpecialFields = null;
             if (this.CommentsSpecialFields != null)
             {
@@ -269,10 +261,6 @@ namespace SabreTools.RedumpLib.Data
                     contentsSpecialFields[kvp.Key] = kvp.Value;
                 }
             }
-#else
-            var commentsSpecialFields = this.CommentsSpecialFields?.ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
-            var contentsSpecialFields = this.ContentsSpecialFields?.ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
-#endif
 
             return new CommonDiscInfoSection
             {
@@ -455,7 +443,6 @@ namespace SabreTools.RedumpLib.Data
 
         public object Clone()
         {
-#if NET20 || NET35
             Dictionary<string, List<string>?>? fullProtections = null;
             if (this.FullProtections != null)
             {
@@ -465,9 +452,6 @@ namespace SabreTools.RedumpLib.Data
                     fullProtections[kvp.Key] = kvp.Value;
                 }
             }
-#else
-            var fullProtections = this.FullProtections?.ToDictionary(kvp => kvp.Key, kvp => kvp.Value);
-#endif
 
             return new CopyProtectionSection
             {

SabreTools.RedumpLib/ExtensionAttribute.cs

@@ -6,4 +6,4 @@ namespace System.Runtime.CompilerServices
     internal sealed class ExtensionAttribute : Attribute {}
 }
 
-#endif
+#endif

SabreTools.RedumpLib/Formatter.cs

@@ -24,6 +24,7 @@ namespace SabreTools.RedumpLib
             SiteCode.InternalName,
             SiteCode.InternalSerialName,
             SiteCode.VolumeLabel,
+            SiteCode.HighSierraVolumeDescriptor,
             SiteCode.Multisession,
             SiteCode.UniversalHash,
             SiteCode.RingNonZeroDataStart,
@@ -64,6 +65,7 @@ namespace SabreTools.RedumpLib
             SiteCode.ElectronicArtsID,
             SiteCode.FoxInteractiveID,
             SiteCode.GTInteractiveID,
+            SiteCode.InterplayID,
             SiteCode.JASRACID,
             SiteCode.KingRecordsID,
             SiteCode.KoeiID,

SabreTools.RedumpLib/SabreTools.RedumpLib.csproj

@@ -2,13 +2,13 @@
 
     <PropertyGroup>
         <!-- Assembly Properties -->
-        <TargetFrameworks>net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
+        <TargetFrameworks>net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net9.0;netstandard2.0;netstandard2.1</TargetFrameworks>
         <IncludeSymbols>true</IncludeSymbols>
         <LangVersion>latest</LangVersion>
         <Nullable>enable</Nullable>
         <SymbolPackageFormat>snupkg</SymbolPackageFormat>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-        <Version>1.6.8</Version>
+        <Version>1.7.2</Version>
 
         <!-- Package Properties -->
         <Authors>Matt Nadareski</Authors>
@@ -34,7 +34,7 @@
         <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.3" />
-        <PackageReference Include="SabreTools.Models" Version="1.5.8" />
+        <PackageReference Include="SabreTools.Models" Version="1.7.1" />
     </ItemGroup>
 
 </Project>

SabreTools.RedumpLib/Web/CookieWebClient.cs

@@ -40,4 +40,4 @@ namespace SabreTools.RedumpLib.Web
             return request;
         }
     }
-}
+}

SabreTools.RedumpLib/Web/DelayHelper.cs

@@ -18,4 +18,4 @@ namespace SabreTools.RedumpLib.Web
             Thread.Sleep(delay * 100);
         }
     }
-}
+}

SabreTools.RedumpLib/Web/Discs.cs

@@ -62,4 +62,4 @@ namespace SabreTools.RedumpLib.Web
             return ids;
         }
     }
-}
+}

SabreTools.RedumpLib/Web/Packs.cs

@@ -68,4 +68,4 @@ namespace SabreTools.RedumpLib.Web
             return true;
         }
     }
-}
+}

SabreTools.RedumpLib/Web/RedumpClient.cs

@@ -36,7 +36,7 @@ namespace SabreTools.RedumpLib.Web
         /// <summary>
         /// Internal client for interaction
         /// </summary>
-#if NETFRAMEWORK
+#if NETFRAMEWORK || NETSTANDARD2_0_OR_GREATER
         private CookieWebClient _internalClient;
 #else
         private HttpClient _internalClient;
@@ -49,7 +49,7 @@ namespace SabreTools.RedumpLib.Web
         /// </summary>
         public RedumpClient()
         {
-#if NETFRAMEWORK
+#if NETFRAMEWORK || NETSTANDARD2_0_OR_GREATER
             _internalClient = new CookieWebClient();
 #else
             _internalClient = new HttpClient(new HttpClientHandler { UseCookies = true }) { Timeout = TimeSpan.FromSeconds(30) };
@@ -131,7 +131,7 @@ namespace SabreTools.RedumpLib.Web
                     var loginPage = await DownloadString(Constants.LoginUrl);
                     string token = Constants.TokenRegex.Match(loginPage ?? string.Empty).Groups[1].Value;
 
-#if NETFRAMEWORK
+#if NETFRAMEWORK || NETSTANDARD2_0_OR_GREATER
                     // Construct the login request
                     _internalClient.Headers[HttpRequestHeader.ContentType] = "application/x-www-form-urlencoded";
                     _internalClient.Encoding = Encoding.UTF8;
@@ -205,7 +205,7 @@ namespace SabreTools.RedumpLib.Web
                 {
 #if NET40
                     return await Task.Factory.StartNew(() => _internalClient.DownloadData(uri));
-#elif NETFRAMEWORK
+#elif NETFRAMEWORK || NETSTANDARD2_0_OR_GREATER
                     return await Task.Run(() => _internalClient.DownloadData(uri));
 #else
                     return await _internalClient.GetByteArrayAsync(uri);
@@ -231,7 +231,7 @@ namespace SabreTools.RedumpLib.Web
 #if NET40
             await Task.Factory.StartNew(() => { _internalClient.DownloadFile(uri, fileName); return true; });
             return _internalClient.GetLastFilename();
-#elif NETFRAMEWORK
+#elif NETFRAMEWORK || NETSTANDARD2_0_OR_GREATER
             await Task.Run(() => _internalClient.DownloadFile(uri, fileName));
             return _internalClient.GetLastFilename();
 #else
@@ -271,7 +271,7 @@ namespace SabreTools.RedumpLib.Web
                 {
 #if NET40
                     return await Task.Factory.StartNew(() => _internalClient.DownloadString(uri));
-#elif NETFRAMEWORK
+#elif NETFRAMEWORK || NETSTANDARD2_0_OR_GREATER
                     return await Task.Run(() => _internalClient.DownloadString(uri));
 #else
                     return await _internalClient.GetStringAsync(uri);
@@ -497,7 +497,7 @@ namespace SabreTools.RedumpLib.Web
             {
 #if NET40
                 return await Task.Factory.StartNew(() => _internalClient.DownloadData(string.Format(url, system.ShortName())));
-#elif NETFRAMEWORK
+#elif NETFRAMEWORK || NETSTANDARD2_0_OR_GREATER
                 return await Task.Run(() => _internalClient.DownloadData(string.Format(url, system.ShortName())));
 #else
                 return await _internalClient.GetByteArrayAsync(string.Format(url, system.ShortName()));
@@ -928,4 +928,4 @@ namespace SabreTools.RedumpLib.Web
 
         #endregion
     }
-}
+}

SabreTools.RedumpLib/Web/Search.cs

@@ -99,4 +99,4 @@ namespace SabreTools.RedumpLib.Web
             return ids;
         }
     }
-}
+}

SabreTools.RedumpLib/Web/User.cs

@@ -69,7 +69,7 @@ namespace SabreTools.RedumpLib.Web
 
             return ids;
         }
-    
+
         /// <summary>
         /// List the disc IDs associated with the given user
         /// </summary>
@@ -107,4 +107,4 @@ namespace SabreTools.RedumpLib.Web
             return ids;
         }
     }
-}
+}

SabreTools.RedumpLib/Web/WIP.cs

@@ -49,4 +49,4 @@ namespace SabreTools.RedumpLib.Web
             return ids;
         }
     }
-}
+}