Bundle mac version of 7z; remove NuGet.exe

.github/workflows/build.yml

@@ -153,10 +153,8 @@ jobs:
           name: tools
       - name: Decompress OSX
         run: |
-          ls -la ./build
-          ls -la ./build/publish
           unzip ./squirrel-osx-x64.zip -d ./build/publish
-          ls -la ./build/publish
+          mv ./build/publish/7zz ./build/publish/bin/
       - name: Create NuGet Package
         run: |
           export NUGET_VERSION=$(nbgv get-version -f json | python3 -c "import sys, json; print(json.load(sys.stdin)['NuGetPackageVersion'])")

build.ps1

@@ -33,13 +33,13 @@ dotnet publish -v minimal -c Release -r win-x86 --self-contained=true "$PSScript
 
 # Copy over all files we need
 Write-Output "Copying files to all the right places"
-Copy-Item -Path "$PSScriptRoot\vendor\7zip\*" -Destination "$BinOut" -Recurse
 Copy-Item -Path "$PSScriptRoot\vendor\wix\*" -Destination "$BinOut" -Recurse
 Copy-Item "$In\Win32\Setup.exe" -Destination "$BinOut"
 Copy-Item "$In\Win32\StubExecutable.exe" -Destination "$BinOut"
 Copy-Item "$PSScriptRoot\vendor\rcedit.exe" -Destination "$BinOut"
 Copy-Item "$PSScriptRoot\vendor\signtool.exe" -Destination "$BinOut"
 Copy-Item "$PSScriptRoot\vendor\singlefilehost.exe" -Destination "$BinOut"
+Copy-Item -Path "$PSScriptRoot\vendor\7za.exe" -Destination "$BinOut"
 
 # Clean up files we do not need to create a nuget package
 Write-Output "Cleaning up intermediate files"

gon.config.json

@@ -1,7 +1,8 @@
 {
   "source": [
     "./osx-build/SquirrelMac",
-    "./osx-build/UpdateMac"
+    "./osx-build/UpdateMac",
+    "./vendor/7zz"
   ],
   "bundle_id": "com.caesay.squirrel",
   "sign": {

src/Squirrel.CommandLine/HelperFile.cs

@@ -44,11 +44,15 @@ namespace Squirrel.CommandLine
         {
             var findCommand = SquirrelRuntimeInfo.IsWindows ? "where" : "which";
 
+            // first search the usual places
             foreach (var n in names) {
                 var helper = FindHelperFile(n, throwWhenNotFound: false);
                 if (helper != null)
                     return helper;
+            }
             
+            // then see if there is something on the path
+            foreach (var n in names) {
                 var result = ProcessUtil.InvokeProcess(findCommand, new[] { n }, null, CancellationToken.None);
                 if (result.ExitCode == 0) {
                     return n;