Bump version

ExtractionTool/ExtractionTool.csproj

@@ -10,7 +10,7 @@
         <Nullable>enable</Nullable>
         <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-        <Version>1.9.3</Version>
+        <Version>1.9.4</Version>
     </PropertyGroup>
 
     <!-- Support All Frameworks -->

InfoPrint/InfoPrint.csproj

@@ -10,7 +10,7 @@
         <Nullable>enable</Nullable>
         <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-        <Version>1.9.3</Version>
+        <Version>1.9.4</Version>
     </PropertyGroup>
 
     <!-- Support All Frameworks -->

SabreTools.Serialization/SabreTools.Serialization.csproj

@@ -8,11 +8,13 @@
         <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
         <IncludeSymbols>true</IncludeSymbols>
         <LangVersion>latest</LangVersion>
+        <!-- Added due to StormLibSharp -->
+        <NoWarn>CS8600;CS8601;CS8603;CS8604;CS8618;CS8625;CS8634;IL3000</NoWarn>
         <Nullable>enable</Nullable>
         <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
         <SymbolPackageFormat>snupkg</SymbolPackageFormat>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-        <Version>1.9.3</Version>
+        <Version>1.9.4</Version>
 
         <!-- Package Properties -->
         <Authors>Matt Nadareski</Authors>
@@ -26,6 +28,28 @@
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
     </PropertyGroup>
 
+    <!-- Support All Frameworks -->
+    <PropertyGroup Condition="$(TargetFramework.StartsWith(`net2`)) OR $(TargetFramework.StartsWith(`net3`)) OR $(TargetFramework.StartsWith(`net4`))">
+        <RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
+    </PropertyGroup>
+    <PropertyGroup Condition="$(TargetFramework.StartsWith(`netcoreapp`)) OR $(TargetFramework.StartsWith(`net5`))">
+        <RuntimeIdentifiers>win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64</RuntimeIdentifiers>
+    </PropertyGroup>
+    <PropertyGroup Condition="$(TargetFramework.StartsWith(`net6`)) OR $(TargetFramework.StartsWith(`net7`)) OR $(TargetFramework.StartsWith(`net8`)) OR $(TargetFramework.StartsWith(`net9`))">
+        <RuntimeIdentifiers>win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>
+    </PropertyGroup>
+    <PropertyGroup Condition="$(RuntimeIdentifier.StartsWith(`osx-arm`))">
+        <TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
+    </PropertyGroup>
+
+    <!-- Set a build flag for Windows specifically -->
+    <PropertyGroup Condition="'$(RuntimeIdentifier)'=='win-x86'">
+        <DefineConstants>$(DefineConstants);WINX86</DefineConstants>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(RuntimeIdentifier)'=='win-x64'">
+        <DefineConstants>$(DefineConstants);WINX64</DefineConstants>
+    </PropertyGroup>
+
     <!-- Exclude certain parts of external modules for by default -->
     <PropertyGroup>
         <DefaultItemExcludes>
@@ -36,9 +60,8 @@
         </DefaultItemExcludes>
     </PropertyGroup>
 
-    <!-- Exclude all external modules for .NET Framework 2.0, .NET Framework 3.5, or non-Windows
-    builds -->
-    <PropertyGroup Condition="$(TargetFramework.StartsWith(`net2`)) OR $(TargetFramework.StartsWith(`net3`)) OR !$(RuntimeIdentifier.StartsWith(`win-x86`))">
+    <!-- Exclude all external modules for .NET Framework 2.0, .NET Framework 3.5, or non-Windows builds -->
+    <PropertyGroup Condition="$(TargetFramework.StartsWith(`net2`)) OR $(TargetFramework.StartsWith(`net3`)) OR !($(RuntimeIdentifier.StartsWith(`win-x86`)) OR $(RuntimeIdentifier.StartsWith(`win-x64`)))">
         <DefaultItemExcludes>
             $(DefaultItemExcludes);
             _EXTERNAL\**

SabreTools.Serialization/Wrappers/MoPaQ.Extraction.cs

@@ -1,6 +1,7 @@
 using System;
 using SabreTools.Serialization.Interfaces;
 #if (NET452_OR_GREATER || NETCOREAPP) && (WINX86 || WINX64)
+using System.IO;
 using StormLibSharp;
 #endif
 
@@ -42,7 +43,6 @@ namespace SabreTools.Serialization.Wrappers
                 // Loop over each entry
                 foreach (string sub in listfileLines)
                 {
-                    // Ensure directory separators are consistent
                     string filename = sub;
                     if (Path.DirectorySeparatorChar == '\\')
                         filename = filename.Replace('/', '\\');
@@ -50,7 +50,7 @@ namespace SabreTools.Serialization.Wrappers
                         filename = filename.Replace('\\', '/');
 
                     // Ensure the full output directory exists
-                    filename = Path.Combine(outDir, filename);
+                    filename = Path.Combine(outputDirectory, filename);
                     var directoryName = Path.GetDirectoryName(filename);
                     if (directoryName != null && !Directory.Exists(directoryName))
                         Directory.CreateDirectory(directoryName);