Merge pull request #157 from finol-digital/develop

v1.118

.gitattributes

@@ -1,7 +1,7 @@
 #
 # Git attributes for Unity projects
 #
-# Compiled by the GameCI community - https://game.ci
+# Compiled by the GameCI community under the MIT license - https://game.ci
 #
 # Latest version at https://gist.github.com/webbertakken/ff250a0d5e59a8aae961c2e509c07fbc
 #
@@ -15,7 +15,7 @@
 
 # Macro attribute: Files with Unity's yaml format
 # linguist-generated means the file is ignored for the repository's language statistics and diffs are hidden by default.
-[attr]unity-yaml-file -text -merge=unityyamlmerge linguist-generated
+[attr]unity-yaml-file -text merge=unityyamlmerge linguist-generated
 
 # Macro attribute: Files intended for LFS
 [attr]lfs-file filter=lfs diff=lfs merge=lfs -text
@@ -111,6 +111,8 @@
 *.dfx lfs-file
 *.FBX lfs-file
 *.fbx lfs-file
+*.glb lfs-file
+*.gltf lfs-file
 *.lwo lfs-file
 *.lwo2 lfs-file
 *.lxo lfs-file

.github/workflows/main.yml

@@ -463,7 +463,7 @@ jobs:
           RELEASE_NOTES: ${{ github.event.release.body }}
         run: echo "$RELEASE_NOTES" > Card-Game-Simulator/fastlane/metadata/en-US/release_notes.txt
       - name: Raise PR to CGS games
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v7
         with:
           token: ${{ secrets.CGS_PAT }}
           path: cgs-games
@@ -813,8 +813,18 @@ jobs:
       - name: Setup Microsoft Store Developer CLI
         uses: microsoft/setup-msstore-cli@v1
       - name: Configure Microsoft Store Developer CLI
+        working-directory: C:/Card-Game-Simulator.git
+        shell: pwsh
         run: msstore reconfigure --tenantId ${{ secrets.MICROSOFT_TENANT_ID }} --sellerId ${{ secrets.MICROSOFT_SELLER_ID }} --clientId ${{ secrets.MICROSOFT_CLIENT_ID }} --clientSecret ${{ secrets.MICROSOFT_KEY }}
+      - name: Build the .appxupload with Microsoft Store Developer CLI
+        working-directory: C:/Card-Game-Simulator.git
+        shell: pwsh
+        run: |
+          msstore init "C:\Card-Game-Simulator.git\build\WSAPlayer\WSAPlayer"
+          msstore package "C:\Card-Game-Simulator.git\build\WSAPlayer\WSAPlayer"
+          dir "C:\Card-Game-Simulator.git\build\WSAPlayer\WSAPlayer"
       - name: Build the .appxupload
+        if: false
         working-directory: C:/Card-Game-Simulator.git
         shell: pwsh
         env:
@@ -850,6 +860,7 @@ jobs:
           app-id: 9N96N5S4W3J0
           package-path: ${{ format('{0}\build\WSAPlayer\WSAPlayer\AppPackages\Card Game Simulator\Card Game Simulator_{1}.0_x86_x64_arm_arm64_bundle_Master.appxupload', 'C:\Card-Game-Simulator.git', needs.buildWSAPlayer.outputs.buildVersion) }}
       - name: Upload to the Microsoft Store
+        if: false
         working-directory: C:/Card-Game-Simulator.git
         shell: pwsh
         env: