Possible CI fix

StrangeRanger · Nov 17, 2023 · fb66b1b · fb66b1b
1 parent 59db6c1
commit fb66b1b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml
@@ -74,7 +74,7 @@ jobs:
       id: nbgv
 
     # Install the .NET Core workload
-    - name: Install .NET Core (net8)
+    - name: Install .NET Core
       uses: actions/setup-dotnet@v3
       with:
         dotnet-version: 8.0.x
@@ -104,22 +104,22 @@ jobs:
         [IO.File]::WriteAllBytes("$certificatePath", $pfx_cert_byte)
 
     # 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 }}
-      env:
-        Appx_Bundle: Always
-        Appx_Bundle_Platforms: x86|x64
-        Appx_Package_Build_Mode: StoreUpload
-        Configuration: ${{ matrix.configuration }}
+    #- 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 }}
+    #  env:
+    #    Appx_Bundle: Always
+    #    Appx_Bundle_Platforms: x86|x64
+    #    Appx_Package_Build_Mode: StoreUpload
+    #    Configuration: ${{ matrix.configuration }}
 
     # NEW: Build the Windows Application Packaging project
-    #- name: Build the Windows Application Packaging Project (wapproj)
-    #  run: msbuild $env:Solution_Path /p:Platform=$env:TargetPlatform /p:Configuration=$env:Configuration /p:UapAppxPackageBuildMode=$env:BuildMode /p:AppxBundle=$env:AppxBundle /p:PackageCertificateKeyFile=$env:SigningCertificate /p:PackageCertificatePassword=${{ secrets.Pfx_Key }}
-    #  env:
-    #    AppxBundle: Never
-    #    BuildMode: SideloadOnly
-    #    Configuration: Debug
-    #    TargetPlatform: ${{ matrix.targetplatform }}
+    - name: Build the Windows Application Packaging Project (wapproj)
+      run: msbuild $env:Solution_Path /p:Platform=$env:TargetPlatform /p:Configuration=$env:Configuration /p:UapAppxPackageBuildMode=$env:BuildMode /p:AppxBundle=$env:AppxBundle /p:PackageCertificateKeyFile=$env:SigningCertificate /p:PackageCertificatePassword=${{ secrets.Pfx_Key }}
+      env:
+        AppxBundle: Never
+        BuildMode: SideloadOnly
+        Configuration: ${{ matrix.configuration }}
+        TargetPlatform: ${{ matrix.targetplatform }}
 
     # Remove the pfx
     - name: Remove the pfx

diff --git a/FAFB-PowerShell-Tool.sln b/FAFB-PowerShell-Tool.sln
@@ -41,9 +41,9 @@ Global
 		{C6E51308-E9E0-4738-9D5A-49841912633B}.Release|x64.Build.0 = Release|Any CPU
 		{C6E51308-E9E0-4738-9D5A-49841912633B}.Release|x86.ActiveCfg = Release|Any CPU
 		{C6E51308-E9E0-4738-9D5A-49841912633B}.Release|x86.Build.0 = Release|Any CPU
-		{C2083856-411C-46E1-B07E-8F97E5D0FA9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C2083856-411C-46E1-B07E-8F97E5D0FA9E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C2083856-411C-46E1-B07E-8F97E5D0FA9E}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
+		{C2083856-411C-46E1-B07E-8F97E5D0FA9E}.Debug|Any CPU.ActiveCfg = Debug|x64
+		{C2083856-411C-46E1-B07E-8F97E5D0FA9E}.Debug|Any CPU.Build.0 = Debug|x64
+		{C2083856-411C-46E1-B07E-8F97E5D0FA9E}.Debug|Any CPU.Deploy.0 = Debug|x64
 		{C2083856-411C-46E1-B07E-8F97E5D0FA9E}.Debug|ARM.ActiveCfg = Debug|ARM
 		{C2083856-411C-46E1-B07E-8F97E5D0FA9E}.Debug|ARM.Build.0 = Debug|ARM
 		{C2083856-411C-46E1-B07E-8F97E5D0FA9E}.Debug|ARM.Deploy.0 = Debug|ARM