Merge develop into l10n_develop and reconcile catalogs

Author: myieye

.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "dotnet-ef": {
-      "version": "9.0.6",
+      "version": "9.0.16",
       "commands": [
         "dotnet-ef"
       ],

.github/workflows/fw-lite.yaml

@@ -21,7 +21,7 @@ on:
     branches:
       - develop
       - main
-      - shadcn-ui-main #just for now ensure PRs to this branch have checks run
+      - feat/sync-morph-types #just for now ensure PRs to this branch have checks run
 env:
   VIEWER_BUILD_OUTPUT_DIR: backend/FwLite/FwLiteShared/wwwroot/viewer
 jobs:
@@ -39,7 +39,9 @@ jobs:
           submodules: true
       - uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '9.x'
+          dotnet-version: '10.x'
+      - name: Setup Maui
+        run: dotnet workload install maui
       - name: Install Task
         uses: arduino/setup-task@b91d5d2c96a56797b48ac1e0e89220bf64044611 #v2
         with:
@@ -177,7 +179,7 @@ jobs:
           path: ${{ env.VIEWER_BUILD_OUTPUT_DIR }}
       - uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '9.x'
+          dotnet-version: '10.x'
 
       - name: Dotnet build
         working-directory: backend/FwLite/FwLiteWeb
@@ -214,7 +216,7 @@ jobs:
           path: ${{ env.VIEWER_BUILD_OUTPUT_DIR }}
       - uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '9.x'
+          dotnet-version: '10.x'
 
       - name: Publish Linux
         working-directory: backend/FwLite/FwLiteWeb
@@ -260,7 +262,7 @@ jobs:
           path: ${{ env.VIEWER_BUILD_OUTPUT_DIR }}
       - uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '9.x'
+          dotnet-version: '10.x'
 
       - name: Setup Maui
         run: dotnet workload install maui
@@ -279,7 +281,7 @@ jobs:
           KEYSTORE_PASS: ${{ secrets.FW_LITE_KEYSTORE_PASS }}
           KEYSTORE_ALIAS: ${{ vars.FW_LITE_KEYSTORE_UPLOAD_KEY_ALIAS }}
         run: |
-          dotnet publish -f net9.0-android -p:BuildApple=false --artifacts-path ../artifacts \
+          dotnet publish -f net10.0-android -p:BuildApple=false --artifacts-path ../artifacts \
             -p:ApplicationDisplayVersion=${{ needs.build-and-test.outputs.semver-version }} \
             -p:ApplicationVersion=${{ github.run_number }} \
             -p:InformationalVersion=${{ needs.build-and-test.outputs.version }} \
@@ -295,8 +297,8 @@ jobs:
         with:
           name: fw-lite-android
           if-no-files-found: error
-#          path looks like this: backend/FwLite/artifacts/publish/FwLiteMaui/release_net9.0-android/org.sil.fwlitemaui-signed.apk
-          path: backend/FwLite/artifacts/publish/FwLiteMaui/release_net9.0-android/*
+#          path looks like this: backend/FwLite/artifacts/publish/FwLiteMaui/release_net10.0-android/org.sil.fwlitemaui-signed.apk
+          path: backend/FwLite/artifacts/publish/FwLiteMaui/release_net10.0-android/*
 
   publish-win:
     name: Publish FW Lite app for Windows
@@ -314,24 +316,27 @@ jobs:
           path: ${{ env.VIEWER_BUILD_OUTPUT_DIR }}
       - uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '9.x'
+          dotnet-version: '10.x'
 
       - name: Setup Maui
         run: dotnet workload install maui
 
       - name: Publish Windows MAUI portable app
         working-directory: backend/FwLite/FwLiteMaui
         run: |
-          dotnet publish -f net9.0-windows10.0.19041.0 -p:BuildAndroid=false --artifacts-path ../artifacts -p:WindowsPackageType=None -p:ApplicationDisplayVersion=${{ needs.build-and-test.outputs.semver-version }} -p:InformationalVersion=${{ needs.build-and-test.outputs.version }}
+          dotnet publish -f net10.0-windows10.0.19041.0 -p:BuildAndroid=false --artifacts-path ../artifacts -p:WindowsPackageType=None -p:ApplicationDisplayVersion=${{ needs.build-and-test.outputs.semver-version }} -p:InformationalVersion=${{ needs.build-and-test.outputs.version }}
           mkdir -p ../artifacts/sign/portable
           cp -r ../artifacts/publish/FwLiteMaui/* ../artifacts/sign/portable/
 
       - name: Publish Windows MAUI msix app
         working-directory: backend/FwLite/FwLiteMaui
         run: |
-          dotnet publish -f net9.0-windows10.0.19041.0 -p:BuildAndroid=false --artifacts-path ../artifacts -p:ApplicationDisplayVersion=${{ needs.build-and-test.outputs.semver-version }} -p:InformationalVersion=${{ needs.build-and-test.outputs.version }}
+          # AppxPackageDir is the MSIX-targets equivalent of --artifacts-path: without it
+          # MAUI 10 writes AppPackages to $(MSBuildProjectDirectory)/AppPackages, ignoring
+          # --artifacts-path. Redirect it under artifacts/ so everything lives in one tree.
+          dotnet publish -f net10.0-windows10.0.19041.0 -p:BuildAndroid=false --artifacts-path ../artifacts -p:AppxPackageDir=../artifacts/AppPackages/ -p:ApplicationDisplayVersion=${{ needs.build-and-test.outputs.semver-version }} -p:InformationalVersion=${{ needs.build-and-test.outputs.version }}
           mkdir -p ../artifacts/msix
-          cp ../artifacts/bin/FwLiteMaui/*/AppPackages/*/*.msix ../artifacts/msix/
+          cp ../artifacts/AppPackages/*/*.msix ../artifacts/msix/
 
       - name: Bundle MSIX
         working-directory: backend/FwLite/artifacts/msix

.github/workflows/integration-test-gha.yaml

@@ -24,7 +24,7 @@ jobs:
           submodules: true
       - uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '9.x'
+          dotnet-version: '10.x'
       - uses: ./.github/actions/setup-k8s
         with:
           lexbox-api-tag: ${{ inputs.lexbox-api-tag }}

.github/workflows/integration-test.yaml

@@ -73,7 +73,7 @@ jobs:
           submodules: true
       - uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '9.x'
+          dotnet-version: '10.x'
       - uses: MatteoH2O1999/setup-python@429b7dee8a48c31eb72ce0b420ea938ff51c2f11 # v3.2.1
         id: python
         if: ${{ inputs.runs-on != 'windows-latest' && !env.act && inputs.hg-version == '3' }}

.github/workflows/lexbox-api.yaml

@@ -49,7 +49,7 @@ jobs:
           submodules: true
       - uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '9.x'
+          dotnet-version: '10.x'
       - name: Install Task
         uses: arduino/setup-task@v2
         with:

.github/workflows/lexbox-fw-headless.yaml

@@ -49,7 +49,7 @@ jobs:
           submodules: true
       - uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: '9.x'
+          dotnet-version: '10.x'
       - name: Dotnet build
         run: dotnet build backend/FwHeadless/FwHeadless.csproj
       # TODO: Write FwHeadless unit tests, probably based on existing sync tests

.gitignore

@@ -37,5 +37,9 @@ failedSyncs/
 # just ignore everything rider related
 .idea
 
-# AI session artifacts (ephemeral planning/review documents)
-history/
+*.lscache
+
+.claude/worktrees/
+.claude/settings.local.json
+.claude/CLAUDE.local.md
+screenshots/

.vscode/launch.json

@@ -15,7 +15,7 @@
       "type": "coreclr",
       "request": "launch",
       "preLaunchTask": "Build FwLite Windows (Maui)",
-      "program": "${workspaceFolder}/backend/FwLite/FwLiteMaui/bin/Debug/net9.0-windows10.0.19041.0/win10-x64/FwLiteMaui.exe",
+      "program": "${workspaceFolder}/backend/FwLite/FwLiteMaui/bin/Debug/net10.0-windows10.0.19041.0/win10-x64/FwLiteMaui.exe",
       "cwd": "${workspaceFolder}/backend/FwLite/FwLiteMaui",
       "stopAtEntry": false,
     },
@@ -24,7 +24,7 @@
       "type": "coreclr",
       "request": "launch",
       "preLaunchTask": "Build Lexbox API",
-      "program": "${workspaceFolder}/backend/LexBoxApi/bin/Debug/net9.0/LexBoxApi.dll",
+      "program": "${workspaceFolder}/backend/LexBoxApi/bin/Debug/net10.0/LexBoxApi.dll",
       "args": [],
       "cwd": "${workspaceFolder}/backend/LexBoxApi",
       "stopAtEntry": false,
@@ -50,7 +50,7 @@
       "type": "coreclr",
       "request": "launch",
       "preLaunchTask": "Build FwHeadless",
-      "program": "${workspaceFolder}/backend/FwHeadless/bin/Debug/net9.0/FwHeadless.dll",
+      "program": "${workspaceFolder}/backend/FwHeadless/bin/Debug/net10.0/FwHeadless.dll",
       "args": [],
       "cwd": "${workspaceFolder}/backend/FwHeadless",
       "stopAtEntry": false,

.vscode/settings.json

@@ -32,6 +32,20 @@
     "yaml.schemas": {
         "https://json.schemastore.org/github-workflow.json": ".github/**/*.yaml"
     },
+    "tailwindCSS.experimental.configFile": {
+      "frontend/tailwind.config.cjs": "frontend/src/**",
+      "frontend/viewer/src/app.css": "frontend/viewer/src/**"
+    },
+    "tailwindCSS.classFunctions": [
+      "cn",
+      "tv",
+      "mergeProps"
+    ],
+    "tailwindCSS.experimental.classRegex": [
+      [
+        "class:\\s*['\"`]([^'\"`]*)['\"`]"
+      ],
+    ],
     "files.associations": {
       "**/frontend/**/i18n/**/*.json": "json5", // Supports json5 syntax: https://svelte-intl-precompile.com/en/docs/getting-started
     },

.vscode/tasks.json

@@ -9,7 +9,7 @@
             "build",
             "${workspaceFolder}/backend/FwLite/FwLiteMaui/FwLiteMaui.csproj",
             "--framework",
-            "net9.0-windows10.0.19041.0",
+            "net10.0-windows10.0.19041.0",
           ],
           "problemMatcher": "$msCompile"
         },