Merge remote-tracking branch 'origin/master'

Author: MinecraftYJQ

.github/workflows/dotnet-desktop.yml

@@ -29,72 +29,6 @@ jobs:
         run: |
           echo "The current time is: ${{ steps.date.outputs.time }}"
 
-  linux:
-    runs-on: ubuntu-20.04
-    needs: time
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      # - name: Time
-      #  id: date
-      #  run: |
-      #    echo "${{ needs.time.outputs.v }}" > ./YMCL/Public/Texts/DateTime.txt
-      #    echo "Version is ${{ needs.time.outputs.v }}"
-      - name: Dependency
-        run: |
-          dotnet tool install -g KuiperZone.PupNet
-          sudo apt-get update
-          sudo apt-get install fuse
-      - name: Build-AppImage
-        run: |
-          cd ./Round.NET.AvaloniaApp.EncodeCalculator.Desktop
-          sudo su
-          pupnet --runtime linux-x64 --kind appimage -o Round.NET.AvaloniaApp.EncodeCalculator.Desktop.linux.x64.AppImage -y --app-version ${{ needs.time.outputs.y }}.${{ needs.time.outputs.md }}.${{ needs.time.outputs.hm }}
-          pupnet --runtime linux-arm --kind appimage -o Round.NET.AvaloniaApp.EncodeCalculator.Desktop.linux.arm.AppImage -y --app-version ${{ needs.time.outputs.y }}.${{ needs.time.outputs.md }}.${{ needs.time.outputs.hm }}
-          pupnet --runtime linux-arm64 --kind appimage -o Round.NET.AvaloniaApp.EncodeCalculator.Desktop.linux.arm64.AppImage -y --app-version ${{ needs.time.outputs.y }}.${{ needs.time.outputs.md }}.${{ needs.time.outputs.hm }}
-      - name: Build-MacOsApp
-        run: |
-          cd ./Round.NET.AvaloniaApp.EncodeCalculator.Desktop
-          sudo su
-          dotnet restore -r osx-x64
-          dotnet msbuild -t:BundleApp -p:RuntimeIdentifier=osx-x64  -property:Configuration=Release -p:SelfContained=true
-          dotnet restore -r osx-arm64
-          dotnet msbuild -t:BundleApp -p:RuntimeIdentifier=osx-arm64  -property:Configuration=Release -p:SelfContained=true
-          cd ./bin/Release/net8.0/
-          cd ./osx-x64/publish/
-          zip -9 -r ../../Round.NET.AvaloniaApp.EncodeCalculator.Desktop.osx.mac.x64.app.zip ./REC.app
-          cd ../../
-          cd ./osx-arm64/publish/
-          zip -9 -r ../../Round.NET.AvaloniaApp.EncodeCalculator.Desktop.osx.mac.arm64.app.zip ./REC.app
-      - name: Build-WinExe
-        run: |
-          cd ./Round.NET.AvaloniaApp.EncodeCalculator.Desktop
-          sudo su
-          dotnet publish -r win-x86 --self-contained true -p:PublishSingleFile=true
-          dotnet publish -r win-x64 --self-contained true -p:PublishSingleFile=true
-          dotnet publish -r win-arm64 --self-contained true -p:PublishSingleFile=true
-          mv ./bin/Release/net8.0/win-x86/publish/Round.NET.AvaloniaApp.EncodeCalculator.Desktop.exe ./bin/Release/net8.0/win-x86/publish/Round.NET.AvaloniaApp.EncodeCalculator.Desktop.win7.x86.exe
-          mv ./bin/Release/net8.0/win-x64/publish/Round.NET.AvaloniaApp.EncodeCalculator.Desktop.exe ./bin/Release/net8.0/win-x64/publish/Round.NET.AvaloniaApp.EncodeCalculator.Desktop.win7.x64.exe
-          mv ./bin/Release/net8.0/win-arm64/publish/Round.NET.AvaloniaApp.EncodeCalculator.Desktop.exe ./bin/Release/net8.0/win-arm64/publish/Round.NET.AvaloniaApp.EncodeCalculator.Desktop.win7.arm64.exe
-          cd ./bin/Release/net8.0/
-          cd ./win-x86/publish/
-          zip -9 -r "../../Round.NET.AvaloniaApp.EncodeCalculator.Desktop.win7.x86.exe.zip" "./Round.NET.AvaloniaApp.EncodeCalculator.Desktop.win7.x86.exe"
-          cd ../../
-          cd ./win-x64/publish/
-          zip -9 -r "../../Round.NET.AvaloniaApp.EncodeCalculator.Desktop.win7.x64.exe.zip" "./Round.NET.AvaloniaApp.EncodeCalculator.Desktop.win7.x64.exe"
-          cd ../../
-          cd ./win-arm64/publish/
-          zip -9 -r "../../Round.NET.AvaloniaApp.EncodeCalculator.Desktop.win7.arm64.exe.zip" "./Round.NET.AvaloniaApp.EncodeCalculator.Desktop.win7.arm64.exe"
-      - name: UploadArtifacts
-        uses: actions/upload-artifact@v3
-        with:
-          name: linux-artifacts
-          path: |
-            ./Round.NET.AvaloniaApp.EncodeCalculator.Desktop/Deploy/OUT/*
-            ./Round.NET.AvaloniaApp.EncodeCalculator.Desktop/bin/Release/net8.0/*.zip
-
   win:
     runs-on: windows-latest
     needs: time
@@ -124,28 +58,23 @@ jobs:
           pupnet -r win-x86 -k setup -y -o Round.NET.AvaloniaApp.EncodeCalculator.Desktop.win.x86.installer.exe --app-version ${{ needs.time.outputs.y }}.${{ needs.time.outputs.md }}.${{ needs.time.outputs.hm }}
           pupnet -r win-arm64 -k setup -y -o Round.NET.AvaloniaApp.EncodeCalculator.Desktop.win.arm64.installer.exe --app-version ${{ needs.time.outputs.y }}.${{ needs.time.outputs.md }}.${{ needs.time.outputs.hm }}
       - name: UploadArtifacts
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: win-artifacts
           path: |
             ./Round.NET.AvaloniaApp.EncodeCalculator.Desktop/Deploy/OUT/*
 
   publish:
-    needs: [linux, win, time]
+    needs: [win, time]
     runs-on: ubuntu-latest
     steps:
       - name: Time
         id: gdate
         run: |
           echo "date=$(date +'%Y-%m-%d.%H-%M-%S')" >> $GITHUB_OUTPUT
           echo "title=$(date +'%Y.%m.%d.%H.%M')" >> $GITHUB_OUTPUT
-      - name: Download-LinuxArtifacts
-        uses: actions/download-artifact@v3
-        with:
-          name: linux-artifacts
-          path: ./Round.NET.AvaloniaApp.EncodeCalculator/Release/
       - name: Download-WindowsArtifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: win-artifacts
           path: ./Round.NET.AvaloniaApp.EncodeCalculator/Release/
@@ -161,5 +90,4 @@ jobs:
           prerelease: false
           files: |
             Round.NET.AvaloniaApp.EncodeCalculator/Release/*.exe
-            Round.NET.AvaloniaApp.EncodeCalculator/Release/Deploy/OUT/*.AppImage
             Round.NET.AvaloniaApp.EncodeCalculator/Release/bin/Release/net8.0/*.zip

Round.NET.AvaloniaApp.EncodeCalculator.Desktop/Round.NET.AvaloniaApp.EncodeCalculator.Desktop.pupnet.conf

@@ -295,4 +295,4 @@ SetupSuffixOutput =
 # Boolean (true or false) which sets whether to include the application version in the setup filename,
 # i.e. 'HelloWorld-1.2.3-x86_64.exe'. Default is false. Ignored if the output filename is specified
 # at command line.
-SetupVersionOutput = false
+SetupVersionOutput = false