Change innoextract util for innowrap library v2

Directory.Packages.props

@@ -23,7 +23,7 @@
     <PackageVersion Include="ini-parser-netstandard" Version="2.5.3" />
     <PackageVersion Include="Microsoft.Extensions.Http" Version="10.0.8" />
     <PackageVersion Include="ObservableCollections" Version="3.3.4" />
-    <PackageVersion Include="SharpCompress" Version="0.48.0" />
+    <PackageVersion Include="SharpCompress" Version="0.49.1" />
     <PackageVersion Include="WindowsShortcutFactory" Version="1.2.0" />
   </ItemGroup>
 </Project>

Knossos.NET.Desktop/Knossos.NET.Desktop.csproj

@@ -11,6 +11,7 @@
 	<TrimMode>copyused</TrimMode>
 	<PublishSingleFile>true</PublishSingleFile>
 	<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
+	<Platforms>AnyCPU;x64</Platforms>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -27,27 +28,109 @@
     </PackageReference>
   </ItemGroup>
 
-    <ItemGroup Condition="'$(Configuration)' != 'Release'">
-	    <AvaloniaResource Include="Assets\**" />
-    </ItemGroup>
-    <!--https://learn.microsoft.com/en-us/dotnet/core/rid-catalog-->
-    <ItemGroup Condition="$(RuntimeIdentifier.StartsWith('win'))">
-	    <AvaloniaResource Include="Assets\utils\win\**" />
-    </ItemGroup>
-    <ItemGroup Condition="$(RuntimeIdentifier.Equals('linux-riscv64'))">
-	    <AvaloniaResource Include="Assets\utils\linux-riscv64\**" />
-    </ItemGroup>
-    <ItemGroup Condition="$(RuntimeIdentifier.Equals('linux-arm64'))">
-	    <AvaloniaResource Include="Assets\utils\linux-arm64\**" />
-    </ItemGroup>
-    <ItemGroup Condition="$(RuntimeIdentifier.Equals('linux-x64'))">
-	    <AvaloniaResource Include="Assets\utils\linux-x64\**" />
-    </ItemGroup>
-    <ItemGroup Condition="$(RuntimeIdentifier.StartsWith('osx'))">
-	    <AvaloniaResource Include="Assets\utils\osx\**" />
-    </ItemGroup>
+  <ItemGroup Condition="'$(Configuration)' != 'Release'">
+	  <AvaloniaResource Include="Assets\**" />
+  </ItemGroup>
+  <!--https://learn.microsoft.com/en-us/dotnet/core/rid-catalog-->
+  <ItemGroup Condition="$(RuntimeIdentifier.StartsWith('win'))">
+	  <AvaloniaResource Include="Assets\utils\win\**" />
+  </ItemGroup>
+  <ItemGroup Condition="$(RuntimeIdentifier.Equals('linux-riscv64'))">
+	  <AvaloniaResource Include="Assets\utils\linux-riscv64\**" />
+  </ItemGroup>
+  <ItemGroup Condition="$(RuntimeIdentifier.Equals('linux-arm64'))">
+	  <AvaloniaResource Include="Assets\utils\linux-arm64\**" />
+  </ItemGroup>
+  <ItemGroup Condition="$(RuntimeIdentifier.Equals('linux-x64'))">
+	  <AvaloniaResource Include="Assets\utils\linux-x64\**" />
+  </ItemGroup>
+  <ItemGroup Condition="$(RuntimeIdentifier.StartsWith('osx'))">
+	  <AvaloniaResource Include="Assets\utils\osx\**" />
+  </ItemGroup>
+
+  <!--
+    NATIVE LIBRARY COPY RULES
+    ==========================================================================
+    $(RuntimeIdentifier) is only set during "dotnet publish -r <RID>".
+    During "dotnet run" / F5 / plain "dotnet build" it is EMPTY.
+    So we use a property that normalises both cases:
+      - If RID is set, use it.
+      - If RID is empty, fall back to the OS + arch MSBuild detects at
+        eval time via RuntimeInformation property functions.
+  -->
+  <PropertyGroup>
+    <_IsWin Condition="$(RuntimeIdentifier.StartsWith('win')) Or
+                       ($(RuntimeIdentifier) == '' And $([MSBuild]::IsOSPlatform('Windows')))">true</_IsWin>
+    <_IsLinux Condition="$(RuntimeIdentifier.StartsWith('linux')) Or
+                         ($(RuntimeIdentifier) == '' And $([MSBuild]::IsOSPlatform('Linux')))">true</_IsLinux>
+    <_IsOsx Condition="$(RuntimeIdentifier.StartsWith('osx')) Or
+                       ($(RuntimeIdentifier) == '' And $([MSBuild]::IsOSPlatform('OSX')))">true</_IsOsx>
+
+    <!-- Arch: prefer explicit RID, otherwise ask the runtime -->
+    <_IsX64 Condition="$(RuntimeIdentifier.Contains('x64')) Or
+                       ('$(RuntimeIdentifier)' == '' And '$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)' == 'X64')">true</_IsX64>
+    <_IsX86 Condition="$(RuntimeIdentifier.Contains('x86')) Or
+                       ('$(RuntimeIdentifier)' == '' And '$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)' == 'X86')">true</_IsX86>
+    <_IsArm64 Condition="$(RuntimeIdentifier.Contains('arm64')) Or
+                         ('$(RuntimeIdentifier)' == '' And '$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)' == 'Arm64')">true</_IsArm64>
+    <_IsRiscV64 Condition="$(RuntimeIdentifier.Contains('riscv64'))">true</_IsRiscV64>
+  </PropertyGroup>
+
+  <!-- Windows -->
+  <ItemGroup Condition="'$(_IsWin)' == 'true' And '$(_IsX64)' == 'true'">
+	<None Update="precompiled\windows\x64\innowrap.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Link>innowrap.dll</Link>
+    </None>
+  </ItemGroup>
+  <ItemGroup Condition="'$(_IsWin)' == 'true' And '$(_IsX86)' == 'true'">
+	<None Update="precompiled\windows\x86\innowrap.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Link>innowrap.dll</Link>
+    </None>
+  </ItemGroup>
+  <ItemGroup Condition="'$(_IsWin)' == 'true' And '$(_IsArm64)' == 'true'">
+	<None Update="precompiled\windows\arm64\innowrap.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Link>innowrap.dll</Link>
+    </None>
+  </ItemGroup>
+
+  <!-- Linux x64 -->
+  <ItemGroup Condition="'$(_IsLinux)' == 'true' And '$(_IsX64)' == 'true'">
+	<None Update="precompiled\linux\x64\libinnowrap.so">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Link>libinnowrap.so</Link>
+    </None>
+  </ItemGroup>
+
+  <!-- Linux arm64 -->
+  <ItemGroup Condition="'$(_IsLinux)' == 'true' And '$(_IsArm64)' == 'true'">
+	<None Update="precompiled\linux\arm64\libinnowrap.so">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Link>libinnowrap.so</Link>
+    </None>
+  </ItemGroup>
+
+  <!-- Linux riscv64 -->
+  <ItemGroup Condition="'$(_IsLinux)' == 'true' And '$(_IsRiscV64)' == 'true'">
+	<None Update="precompiled\linux\riscv64\libinnowrap.so">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Link>libinnowrap.so</Link>
+    </None>
+  </ItemGroup>
+
+  <!-- macOS (x64 / arm64) -->
+  <ItemGroup Condition="'$(_IsOsx)' == 'true'">
+	<None Update="precompiled\osx\libinnowrap.dylib">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <Link>libinnowrap.dylib</Link>
+    </None>
+  </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Knossos.NET\Knossos.NET.csproj" />
   </ItemGroup>
+
 </Project>
+

Knossos.NET.Desktop/precompiled/3rdparty/innoextract/LICENSE

@@ -0,0 +1,18 @@
+
+Copyright (C) 2011-2020 Daniel Scharrer <daniel@constexpr.org>
+
+This software is provided 'as-is', without any express or implied
+warranty.  In no event will the author(s) be held liable for any damages
+arising from the use of this software.
+
+Permission is granted to anyone to use this software for any purpose,
+including commercial applications, and to alter it and redistribute it
+freely, subject to the following restrictions:
+
+1. The origin of this software must not be misrepresented; you must not
+   claim that you wrote the original software. If you use this software
+   in a product, an acknowledgment in the product documentation would be
+   appreciated but is not required.
+2. Altered source versions must be plainly marked as such, and must not be
+   misrepresented as being the original software.
+3. This notice may not be removed or altered from any source distribution.