Subsume used DiscUtils libraries

LibIRD/IRD.cs

@@ -1,13 +1,13 @@
-using DiscUtils;
-using DiscUtils.Iso9660;
-using DiscUtils.Streams;
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.IO.Compression;
 using System.IO.Hashing;
 using System.Security.Cryptography;
 using System.Text;
+using LibIRD.DiscUtils;
+using LibIRD.DiscUtils.Iso9660;
+using LibIRD.DiscUtils.Streams;
 
 namespace LibIRD
 {
@@ -540,11 +540,11 @@ namespace LibIRD
         private protected void ParseGetKeyLog(string getKeyLog)
         {
             // Validate .getkey.log file path
-            if (!File.Exists(getKeyLog))
+            if (!System.IO.File.Exists(getKeyLog))
                 throw new FileNotFoundException(nameof(getKeyLog));
 
             // Read from .getkey.log file
-            using StreamReader sr = File.OpenText(getKeyLog);
+            using StreamReader sr = System.IO.File.OpenText(getKeyLog);
 
             // Determine whether GetKey was successful
             string line;
@@ -1363,7 +1363,7 @@ namespace LibIRD
             // Validate irdPath
             if (irdPath == null || irdPath.Length <= 0)
                 throw new ArgumentNullException(nameof(irdPath));
-            if (!File.Exists(irdPath))
+            if (!System.IO.File.Exists(irdPath))
                 throw new FileNotFoundException(nameof(irdPath));
 
             // Open IRD for reading
@@ -1507,7 +1507,7 @@ namespace LibIRD
             }
             else
             {
-                File.AppendAllText(printPath, printText.ToString());
+                System.IO.File.AppendAllText(printPath, printText.ToString());
             }
         }
 
@@ -1557,7 +1557,7 @@ namespace LibIRD
             else
             {
                 // Write to path
-                File.AppendAllText(jsonPath, json.ToString());
+                System.IO.File.AppendAllText(jsonPath, json.ToString());
             }
         }
 

LibIRD/LibIRD.csproj

@@ -6,7 +6,7 @@
     <RuntimeIdentifiers>win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>
     <LangVersion>latest</LangVersion>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <Version>0.6.0</Version>
+    <Version>0.6.1</Version>
     <PackageOutputPath>../nupkg</PackageOutputPath>
     
     <!-- Package Properties -->
@@ -26,19 +26,7 @@
   </ItemGroup>
   
   <ItemGroup>
-    <ProjectReference Include=".\DiscUtils\Library\DiscUtils.Core\DiscUtils.Core.csproj" PrivateAssets="All" />
-    <ProjectReference Include=".\DiscUtils\Library\DiscUtils.Iso9660\DiscUtils.Iso9660.csproj" PrivateAssets="All" />
-    <ProjectReference Include=".\DiscUtils\Library\DiscUtils.Streams\DiscUtils.Streams.csproj" PrivateAssets="All" />
     <PackageReference Include="System.IO.Hashing" Version="8.0.0" />
   </ItemGroup>
 
-  <PropertyGroup>
-    <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage</TargetsForTfmSpecificBuildOutput>
-  </PropertyGroup>
-  <Target Name="CopyProjectReferencesToPackage" DependsOnTargets="BuildOnlySettings;ResolveReferences">
-    <ItemGroup>
-      <BuildOutputInPackage Include="@(ReferenceCopyLocalPaths-&gt;WithMetadataValue('ReferenceSourceTarget', 'ProjectReference')-&gt;WithMetadataValue('PrivateAssets', 'All'))" />
-    </ItemGroup>
-  </Target>
-
 </Project>

LibIRD/ReIRD.cs

@@ -1,5 +1,4 @@
-using DiscUtils.Iso9660;
-using System;
+using System;
 using System.IO;
 using System.IO.Hashing;
 
@@ -135,7 +134,7 @@ namespace LibIRD
             {
                 // If no layerbreak provided, ensure ISO is not BD-Video hybrid
                 using FileStream fs = new FileStream(isoPath, FileMode.Open, FileAccess.Read) ?? throw new FileNotFoundException(isoPath);
-                CDReader reader = new(fs, true, true);
+                DiscUtils.Iso9660.CDReader reader = new(fs, true, true);
                 if (reader.DirectoryExists("\\BDMV"))
                     throw new ArgumentException("Layerbreak must be provided for BD-Video hybrid discs");
                 // Assume disc has default layerbreak