From 42fbe4061ba6f0a8504d1faeca8452e4805b28b7 Mon Sep 17 00:00:00 2001
From: Hunter T <strangeranger@hthompson.dev>
Date: Thu, 16 Nov 2023 19:41:14 -0800
Subject: [PATCH] Update dotnet-desktop.yml

---
 .github/workflows/dotnet-desktop.yml | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml
index bae5bd7..cf9f99e 100644
--- a/.github/workflows/dotnet-desktop.yml
+++ b/.github/workflows/dotnet-desktop.yml
@@ -50,7 +50,7 @@ jobs:
 
     strategy:
       matrix:
-        #configuration: [Debug, Release]
+        configuration: [Debug, Release]
         targetplatform: [x86, x64]
 
     runs-on: windows-latest  # For a list of available runner types, refer to
@@ -103,25 +103,24 @@ jobs:
     - name:  Restore the Wpf application to populate the obj folder
       run: msbuild $env:Solution_Path /t:Restore /p:Configuration=$env:Configuration /p:RuntimeIdentifier=$env:RuntimeIdentifier
       env:
-        #Configuration: ${{ matrix.configuration }}
         Configuration: Debug
         RuntimeIdentifier: win-${{ matrix.targetplatform }}
 
     # OLD: Decode the base 64 encoded pfx and save the Signing_Certificate
-    - name: Decode the pfx
-      run: |
-        $pfx_cert_byte = [System.Convert]::FromBase64String("${{ secrets.Base64_Encoded_Pfx }}")
-        $certificatePath = Join-Path -Path $env:Wap_Project_Directory -ChildPath $env:SigningCertificate
-        [IO.File]::WriteAllBytes("$certificatePath", $pfx_cert_byte)
-
-    # NEW: Decode the Base64 encoded Pfx
-    #- name: Decode the Pfx
+    #- name: Decode the pfx
     #  run: |
     #    $pfx_cert_byte = [System.Convert]::FromBase64String("${{ secrets.Base64_Encoded_Pfx }}")
-    #    $currentDirectory = Get-Location
-    #    $certificatePath = Join-Path -Path $currentDirectory -ChildPath $env:Wap_Project_Directory -AdditionalChildPath $env:SigningCertificate
+    #    $certificatePath = Join-Path -Path $env:Wap_Project_Directory -ChildPath $env:SigningCertificate
     #    [IO.File]::WriteAllBytes("$certificatePath", $pfx_cert_byte)
 
+    # NEW: Decode the Base64 encoded Pfx
+    - name: Decode the Pfx
+      run: |
+        $pfx_cert_byte = [System.Convert]::FromBase64String("${{ secrets.Base64_Encoded_Pfx }}")
+        $currentDirectory = Get-Location
+        $certificatePath = Join-Path -Path $currentDirectory -ChildPath $env:Wap_Project_Directory -AdditionalChildPath $env:SigningCertificate
+        [IO.File]::WriteAllBytes("$certificatePath", $pfx_cert_byte)
+
     # OLD: Create the app package by building and packaging the Windows Application Packaging project
     #- 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:PackageCertificateKeyFile=GitHubActionsWorkflow.pfx /p:PackageCertificatePassword=${{ secrets.Pfx_Key }}
@@ -137,7 +136,6 @@ jobs:
       env:
         AppxBundle: Never
         BuildMode: SideloadOnly
-        #Configuration: ${{ matrix.configuration }}
         Configuration: Debug
         TargetPlatform: ${{ matrix.targetplatform }}