Merge pull request #49 from mark-s/net8

mark-s · May 5, 2024 · e863317 · e863317
2 parents 9210063 + b4af9ac
commit e863317
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/.github/workflows/ReleaseAll.yml b/.github/workflows/ReleaseAll.yml
@@ -43,23 +43,23 @@ jobs:
           release_name="QnapBackupDecryptor-FD-$tag-${{ matrix.target }}"
 
           # Build everything
-          dotnet publish ./QnapBackupDecryptor.Console/QnapBackupDecryptor.Console.csproj  -c Release -f net8.0 -r ${{ matrix.target }} --self-contained false -p:PublishSingleFile=true --property:PublishDir="./releases/$release_name"
+          dotnet publish ./QnapBackupDecryptor.Console/QnapBackupDecryptor.Console.csproj  -c Release -f net8.0 -r ${{ matrix.target }} --self-contained false -p:PublishSingleFile=true --property:PublishDir="${{ github.workspace }}/releases/$release_name"
 
           # bin the pdb files
-          rm ./releases/$release_name/*.pdb
+          rm ${{ github.workspace }}/releases/$release_name/*.pdb
 
           # Pack files
           if [ "${{ matrix.target }}" == "win-x64" ]; then
             # Pack to zip for Windows
-            mv ./releases/$release_name/QnapBackupDecryptor.Console.exe ./releases/$release_name/QnapBackupDecryptor.exe
-            7z a -tzip "../${release_name}.zip" "./releases/${release_name}/*"
+            mv ${{ github.workspace }}/releases/$release_name/QnapBackupDecryptor.Console.exe ${{ github.workspace }}/releases/$release_name/QnapBackupDecryptor.exe
+            7z a -tzip "../${release_name}.zip" "${{ github.workspace }}/releases/${release_name}/*"
           else
-            mv ./releases/$release_name/QnapBackupDecryptor.Console ./releases/$release_name/QnapBackupDecryptor
-            tar czvf "../${release_name}.tar.gz" "./releases/$release_name"
+            mv ${{ github.workspace }}/releases/$release_name/QnapBackupDecryptor.Console ${{ github.workspace }}/releases/$release_name/QnapBackupDecryptor
+            tar czvf "../${release_name}.tar.gz" "${{ github.workspace }}/releases/$release_name"
           fi
 
           # Delete output directory
-          rm -r "./releases/$release_name"
+          rm -r "${{ github.workspace }}/releases/$release_name"
       - name: Publish
         uses: softprops/action-gh-release@v2
         with:
@@ -75,21 +75,21 @@ jobs:
           release_name="QnapBackupDecryptor-SC-$tag-${{ matrix.target }}"
 
           # Build everything
-          dotnet publish QnapBackupDecryptor.sln -c Release -f net8.0 -r ${{ matrix.target }} --self-contained true --property:PublishDir="./releases/$release_name"
+          dotnet publish QnapBackupDecryptor.sln -c Release -f net8.0 -r ${{ matrix.target }} --self-contained true --property:PublishDir="${{ github.workspace }}/releases/$release_name"
 
           # bin the pdb files
-          rm ./releases/$release_name/*.pdb
+          rm ${{ github.workspace }}/releases/$release_name/*.pdb
 
           # Pack files
           if [ "${{ matrix.target }}" == "win-x64" ]; then
             # Pack to zip for Windows
-            7z a -tzip "../${release_name}.zip" "./releases/${release_name}/*"
+            7z a -tzip "../${release_name}.zip" "${{ github.workspace }}/releases/${release_name}/*"
           else
-            tar czvf "../${release_name}.tar.gz" "./releases/$release_name"
+            tar czvf "../${release_name}.tar.gz" "${{ github.workspace }}/releases/$release_name"
           fi
 
           # Delete output directory
-          rm -r "./releases/$release_name"
+          rm -r "${{ github.workspace }}/releases/$release_name"
       - name: Publish
         uses: softprops/action-gh-release@v2
         with:

diff --git a/src/QnapBackupDecryptor.Console/Options.cs b/src/QnapBackupDecryptor.Console/Options.cs
@@ -1,5 +1,4 @@
-using System.Diagnostics.CodeAnalysis;
-using CommandLine;
+using CommandLine;
 using CommandLine.Text;
 
 namespace QnapBackupDecryptor.Console;