Refactor dotnet-desktop.yml to improve variable usage and streamline build steps

Author: Coolis1362

.github/workflows/dotnet-desktop.yml

@@ -18,7 +18,8 @@ jobs:
       Solution_Name: TTSBroswer.sln
       Test_Project_Path: TTSBroswer.TTSBroswer/TTSBroswer.TTSBroswer.csproj
       Wap_Project_Directory: TTSBroswer.TSBroswer
-      Wap_Project_Path: TTSBroswer.TTSBroswer/TTSBroswer.TTSBroswer.wapproj
+      Wap_Project_Path: TTSBroswer.TSBroswer/TTSBroswer.TSBroswer.wapproj
+      BASE64_PFX: ${{ secrets.Base64_Encoded_Pfx }}
 
     steps:
     - name: Checkout repository
@@ -35,39 +36,44 @@ jobs:
       uses: microsoft/setup-msbuild@v2
 
     - name: Restore NuGet packages
-      run: dotnet restore $env:Solution_Name
+      run: dotnet restore ${{ env.Solution_Name }}
 
     - name: Build solution
-      run: msbuild $env:Solution_Name /p:Configuration=$env:Configuration
-      env:
-        Configuration: ${{ matrix.configuration }}
+      run: msbuild ${{ env.Solution_Name }} /p:Configuration=${{ matrix.configuration }}
 
     - name: Execute unit tests
-      run: dotnet test $env:Test_Project_Path --configuration $env:Configuration --no-build --verbosity normal
-
-    - name: Restore Wap project
-      run: msbuild $env:Wap_Project_Path /t:Restore /p:Configuration=$env:Configuration
-      env:
-        Configuration: ${{ matrix.configuration }}
+      run: dotnet test ${{ env.Test_Project_Path }} --configuration ${{ matrix.configuration }} --no-build --verbosity normal
 
+    - name: Restore WAP project
+      run: |
+        msbuild "${{ env.Wap_Project_Path }}" /t:Restore /p:Configuration=${{ matrix.configuration }}
     - name: Decode the pfx
-      if: ${{ secrets.Base64_Encoded_Pfx != '' }}
+      if: env.BASE64_PFX != ''
+      shell: pwsh
       run: |
-        $pfx_cert_byte = [System.Convert]::FromBase64String("${{ secrets.Base64_Encoded_Pfx }}")
-        $certificatePath = Join-Path -Path $env:Wap_Project_Directory -ChildPath GitHubActionsWorkflow.pfx
-        [IO.File]::WriteAllBytes("$certificatePath", $pfx_cert_byte)
+        $pfx_cert_byte = [System.Convert]::FromBase64String("${{ env.BASE64_PFX }}")
+        $certificatePath = Join-Path -Path "${{ env.Wap_Project_Directory }}" -ChildPath "GitHubActionsWorkflow.pfx"
+        [System.IO.File]::WriteAllBytes($certificatePath, $pfx_cert_byte)
+        [System.IO.File]::WriteAllBytes($certificatePath, $pfx_cert_byte)
 
     - name: Create the app package
-      run: msbuild $env:Wap_Project_Path /p:Configuration=$env:Configuration /p:UapAppxPackageBuildMode=$env:Appx_Package_Build_Mode /p:AppxBundle=$env:Appx_Bundle /p:AppxBundlePlatforms=$env:Appx_Bundle_Platforms /p:PackageCertificateKeyFile=$env:Wap_Project_Directory\GitHubActionsWorkflow.pfx /p:PackageCertificatePassword=${{ secrets.Pfx_Key }}
-      env:
-        Appx_Bundle: Always
-        Appx_Bundle_Platforms: x86|x64
-        Appx_Package_Build_Mode: StoreUpload
-        Configuration: ${{ matrix.configuration }}
-
+      run: |
+        msbuild "${{ env.Wap_Project_Path }}" `
+          /p:Configuration=${{ matrix.configuration }} `
+          /p:UapAppxPackageBuildMode=StoreUpload `
+          /p:AppxBundle=Always `
+          /p:AppxBundlePlatforms="x86|x64" `
+          /p:PackageCertificateKeyFile="${{ env.Wap_Project_Directory }}\GitHubActionsWorkflow.pfx" `
+          /p:PackageCertificatePassword=${{ secrets.Pfx_Key }}
     - name: Remove the pfx
-      if: ${{ secrets.Base64_Encoded_Pfx != '' }}
-      run: Remove-Item -Path "$env:Wap_Project_Directory\GitHubActionsWorkflow.pfx" -Force
+      if: env.BASE64_PFX != ''
+      shell: pwsh
+      run: |
+        $certificatePath = Join-Path -Path "${{ env.Wap_Project_Directory }}" -ChildPath "GitHubActionsWorkflow.pfx"
+        if (Test-Path $certificatePath) {
+          Remove-Item -Path $certificatePath -Force
+        }
+        }
 
     - name: Upload build artifacts
       uses: actions/upload-artifact@v4