Update CI/CD

Author: 0x5bfa

.github/workflows/cd-store.yml

@@ -18,18 +18,16 @@ jobs:
         configuration: [Release] # Consider to use Store
         platform: [x64]
     env:
-      APPX_BUNDLE_PLATFORMS:        'x64|arm64'
-      CONFIGURATION:                '${{ matrix.configuration }}'
-      PLATFORM:                     '${{ matrix.platform }}'
-      WORKING_DIR:                  '${{ github.workspace }}' # Default: 'D:\a\FluentHub\FluentHub'
-      SOLUTION_PATH:                '${{ github.workspace }}\FluentHub.slnx'
-      APP_PROJECT_DIR:              '${{ github.workspace }}\src\FluentHub.App'
-      APP_PROJECT_PATH:             '${{ github.workspace }}\src\FluentHub.App\FluentHub.App.csproj'
-      APP_CREDENTIALS_PATH:         '${{ github.workspace }}\src\FluentHub.App\AppCredentials.config'
-      ARTIFACTS_STAGING_DIR:        '${{ github.workspace }}\artifacts'
-      APPX_PACKAGE_DIR:             '${{ github.workspace }}\artifacts\AppxPackages'
-      STORE_BROKER_STAGING_DIR:     '${{ github.workspace }}\.github\configurations\MicrosoftStore\submission'
-      STORE_BROKER_CONFIG_PATH:     '${{ github.workspace }}\.github\configurations\MicrosoftStore\config.json'
+      APPX_BUNDLE_PLATFORMS:         'x64|arm64'
+      CONFIGURATION:                 '${{ matrix.configuration }}'
+      PLATFORM:                      '${{ matrix.platform }}'
+      WORKING_DIR:                   '${{ github.workspace }}' # Default: 'D:\a\FluentHub\FluentHub'
+      APP_PACKAGE_DIR:               '${{ github.workspace }}\src\FluentHub.App\AppPackages\'
+      APP_PROJECT_PATH:              '${{ github.workspace }}\src\FluentHub.App\FluentHub.App.csproj'
+      APP_MANIFEST_PATH:             '${{ github.workspace }}\src\FluentHub.App\Package.appxmanifest'
+      APP_CREDENTIALS_PATH:          '${{ github.workspace }}\src\FluentHub.App\AppCredentials.config'
+      STORE_BROKER_STAGING_DIR:      '${{ github.workspace }}\.github\configurations\MicrosoftStore\submission'
+      STORE_BROKER_CONFIG_PATH:      '${{ github.workspace }}\.github\configurations\MicrosoftStore\config.json'
 
     steps:
     - name: Checkout the repository
@@ -46,7 +44,9 @@ jobs:
         $bytes = [Convert]::FromBase64String($env:GH_CREDENTIALS_SECRET)
         [IO.File]::WriteAllBytes($env:APP_CREDENTIALS_PATH, $bytes)
 
-        ./.github/scripts/Build-App.ps1 `
+        cd $env:WORKING_DIR\src
+
+        & "$env:WORKING_DIR\.github\scripts\Build-App.ps1" `
           -Platform $env:PLATFORM `
           -Configuration $env:CONFIGURATION `
           -IsStorePublish $true `

.github/workflows/ci.yml

@@ -25,8 +25,6 @@ env:
   APP_PROJECT_PATH:              '${{ github.workspace }}\src\FluentHub.App\FluentHub.App.csproj'
   APP_MANIFEST_PATH:             '${{ github.workspace }}\src\FluentHub.App\Package.appxmanifest'
   APP_CREDENTIALS_PATH:          '${{ github.workspace }}\src\FluentHub.App\AppCredentials.config'
-  AUTOMATED_TESTS_PLATFORM:      'x64'
-  AUTOMATED_TESTS_CONFIGURATION: 'Release'
 
 jobs:
   build:
@@ -56,7 +54,9 @@ jobs:
         $bytes = [Convert]::FromBase64String($env:GH_CREDENTIALS_SECRET)
         [IO.File]::WriteAllBytes($env:APP_CREDENTIALS_PATH, $bytes)
 
-        ./.github/scripts/Build-App.ps1 `
+        cd $env:WORKING_DIR\src
+
+        & "$env:WORKING_DIR\.github\scripts\Build-App.ps1" `
           -Platform $env:PLATFORM `
           -Configuration $env:CONFIGURATION `
           -PackageManifestPath $env:APP_MANIFEST_PATH
@@ -67,4 +67,4 @@ jobs:
       uses: actions/upload-artifact@v4
       with:
         name: 'Appx Packages (${{ env.CONFIGURATION }}, ${{ env.PLATFORM }})'
-        path: ${{ env.APP_APPX_DIR }}
+        path: ${{ env.APP_PACKAGE_DIR }}