build updates; try apt nuget on ubuntu

.github/workflows/build.yml

@@ -136,10 +136,8 @@ jobs:
           dotnet-version: ${{ env.DOTNET_VERSION }}
       - name: Install NGBV
         run: dotnet tool install --tool-path . nbgv
-      - name: Get NuGet Version
-        run: |
-          export NUGET_VERSION=$(nbgv get-version -f json | python3 -c "import sys, json; print(json.load(sys.stdin)['NuGetPackageVersion'])")
-          echo $NUGET_VERSION
+      - name: Install NuGet
+        run: sudo apt install nuget
       - name: Download Windows Artifacts
         uses: actions/download-artifact@v3
         with:
@@ -149,12 +147,19 @@ jobs:
         uses: actions/download-artifact@v3
         with:
           name: tools
-      - name: Decompress Tools
+      - name: Decompress OSX
         run: |
           unzip ./squirrel-osx-x64.zip -d ./build/publish
-          ls -la 
-          ls -la ./build
-          ls -la ./build/publish
+      - name: Create NuGet Package
+        run: |
+          export NUGET_VERSION=$(nbgv get-version -f json | python3 -c "import sys, json; print(json.load(sys.stdin)['NuGetPackageVersion'])")
+          echo $NUGET_VERSION
+          nuget pack ./src/Clowd.Squirrel.nuspec -BasePath ./src -OutputDirectory . -Version $NUGET_VERSION
+      - name: Upload NuGet Package
+        uses: actions/upload-artifact@v3
+        with:
+          name: tools
+          path: '*.nupkg'
 #      - name: Upload Artifacts
 #        uses: actions/upload-artifact@v3
 #        with:

build.ps1

@@ -21,26 +21,34 @@ foreach ($Folder in $Folders) {
 }
 
 # Build Squirrel C++ with msbuild as dotnet can't
+Write-Output "Building Solution"
 &"$MSBuildPath" /verbosity:minimal /restore /p:Configuration=Release
 
 # Build single-exe packaged projects
-# New-Item -Path "$Out" -Name "win-x86" -ItemType "directory"
-$BinOut = $Out
+Write-Output "Publishing SingleFile Projects"
+New-Item -Path "$Out" -Name "bin" -ItemType "directory"
+$BinOut = "$Out\bin"
 dotnet publish -v minimal -c Release -r win-x64 --self-contained=true "$PSScriptRoot\src\Squirrel.CommandLine.Windows\Squirrel.CommandLine.Windows.csproj" -o "$Out"
-dotnet publish -v minimal -c Release -r win-x86 --self-contained=true "$PSScriptRoot\src\Update.Windows\Update.Windows.csproj" -o "$BinOut"
+dotnet publish -v minimal -c Release -r win-x86 --self-contained=true "$PSScriptRoot\src\Update.Windows\Update.Windows.csproj" -o "$Out"
 
 # 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\nuget.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"
 
+# Clean up files we do not need to create a nuget package
+Write-Output "Cleaning up intermediate files"
 Remove-Item "$Out\*.pdb"
 Remove-Item "$BinOut\*.pdb"
 Remove-Item "$Out\SquirrelLib.xml"
+Remove-Item "$In\..\obj" -Recurse
+Remove-Item "$In\Win32" -Recurse
+Remove-Item "$In\net6.0-windows" -Recurse
+
+Write-Output "Done."
 
-Write-Output "Successfully copied files to './build/publish'"

src/Squirrel.CommandLine/HelperFile.cs

@@ -25,9 +25,8 @@ namespace Squirrel.CommandLine
             AddSearchPath(SquirrelRuntimeInfo.BaseDirectory, "..", "..", "..", "vendor");
             AddSearchPath(SquirrelRuntimeInfo.BaseDirectory, "..", "..", "..", "vendor", "7zip");
             AddSearchPath(SquirrelRuntimeInfo.BaseDirectory, "..", "..", "..", "vendor", "wix");
-#else
-            AddSearchPath(SquirrelRuntimeInfo.BaseDirectory, "bin");
 #endif
+            AddSearchPath(SquirrelRuntimeInfo.BaseDirectory, "bin");
         }
 
         public static void AddSearchPath(params string[] pathParts)