Bundled the latest version of 7zip

LavaGang · Nov 14, 2024 · a4773bd · a4773bd
1 parent a561e3d
commit a4773bd
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/Generator/Dependencies/7zz b/Generator/Dependencies/7zz
diff --git a/Generator/Generator.csproj b/Generator/Generator.csproj
@@ -11,5 +11,9 @@
     <ItemGroup>
       <PackageReference Include="Octokit" Version="13.0.1" />
     </ItemGroup>
+
+    <ItemGroup>
+        <None Include="Dependencies/**" CopyToOutputDirectory="PreserveNewest" />
+    </ItemGroup>
 
 </Project>
diff --git a/Generator/SevenZip.cs b/Generator/SevenZip.cs
@@ -4,6 +4,8 @@ namespace Generator;
 
 public static class SevenZip
 {
+    private static readonly string sevenZipPath = Path.Combine(Path.GetDirectoryName(Environment.ProcessPath)!, "Dependencies", "7zz");
+
     public static async Task ExtractAsync(string archive, string outputDir, bool keepStructure, params string[] fileFilter)
     {
         var args = new List<string>()
@@ -13,7 +15,7 @@ public static async Task ExtractAsync(string archive, string outputDir, bool kee
 
         args.AddRange(fileFilter);
 
-        var proc = Process.Start("7z", args);
+        var proc = Process.Start(sevenZipPath, args);
         await proc.WaitForExitAsync();
         if (proc.ExitCode != 0)
             throw new($"7z exit code: {proc.ExitCode}");

diff --git a/README.md b/README.md
@@ -12,11 +12,11 @@ The generator project itself is licensed under the Apache License, Version 2.0.
 
 Third-party Libraries used as Source Code and/or bundled in Binary Form:
 
+- [7-Zip](https://www.7-zip.org/) is licensed under the GNU LGPL License. See [LICENSE](https://www.7-zip.org/license.txt) for the full License.
 - [octokit.net](https://github.com/octokit/octokit.net) is licensed under the MIT License. See [LICENSE](https://github.com/octokit/octokit.net/blob/main/LICENSE.txt) for the full License.
 
 External Libraries and Tools that are downloaded and/or used:
 
-- [7-Zip](https://www.7-zip.org/) is licensed under the GNU LGPL License. See [LICENSE](https://www.7-zip.org/license.txt) for the full License.
 - Unity Runtime Libraries are part of Unity Software.  
 Their usage is subject to [Unity Terms of Service](https://unity3d.com/legal/terms-of-service), including [Unity Software Additional Terms](https://unity3d.com/legal/terms-of-service/software).