Fix auth service deployment not updating container

The crane+docker-load approach was causing image tagging issues where the
loaded image didn't have the expected registry tag, causing docker-compose
to not find the correct image.

Changes:
- Use simple `docker pull` instead of crane pull + docker load (since
  deploy server is already logged into the registry)
- Add verification that the running container is using the expected image
- Fail the workflow if container is running the wrong image

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>

.gitattributes

@@ -10,4 +10,3 @@
 src/main/csharp/**/GUI[[:space:]]Pro[[:space:]]Kit*/**/*.ttf !filter !diff !merge
 src/main/csharp/**/Modern[[:space:]]UI[[:space:]]Pack/**/*.ttf !filter !diff !merge
 *.herodata filter=lfs diff=lfs merge=lfs -text
-*.ogg filter=lfs diff=lfs merge=lfs -text

.github/workflows/artifact_storage_check.yml

@@ -1,37 +0,0 @@
-name: Artifact Storage Check
-
-on:
-  schedule:
-    # Run every 6 hours
-    - cron: '0 */6 * * *'
-  workflow_dispatch:
-
-jobs:
-  check-storage:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Check artifact storage size
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: |
-          # Calculate total artifact storage
-          total_bytes=$(gh api "repos/${{ github.repository }}/actions/artifacts" \
-            --paginate -q '.artifacts[].size_in_bytes' | awk '{sum+=$1} END {print sum}')
-
-          total_mb=$((total_bytes / 1024 / 1024))
-          echo "Total artifact storage: ${total_mb} MB"
-
-          # Fail if over 500MB
-          if [ "$total_mb" -gt 500 ]; then
-            echo "::error::Artifact storage is ${total_mb} MB, which exceeds the 500 MB threshold!"
-            echo ""
-            echo "Largest artifacts:"
-            gh api "repos/${{ github.repository }}/actions/artifacts" \
-              --paginate -q '.artifacts[] | "\(.size_in_bytes)\t\(.name)\t\(.created_at)"' | \
-              sort -rn | head -20 | \
-              awk -F'\t' '{printf "%d MB\t%s\t%s\n", $1/1024/1024, $2, $3}'
-            exit 1
-          fi
-
-          echo "Storage is within acceptable limits."

.github/workflows/auth_build.yml

@@ -110,8 +110,6 @@ jobs:
       APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
       APPLE_SIGNIN_KEY_ID: ${{ secrets.APPLE_SIGNIN_KEY_ID }}
       APPLE_SIGNIN_PRIVATE_KEY: ${{ secrets.APPLE_SIGNIN_PRIVATE_KEY }}
-      TWITCH_CLIENT_ID: ${{ secrets.TWITCH_CLIENT_ID }}
-      TWITCH_CLIENT_SECRET: ${{ secrets.TWITCH_CLIENT_SECRET }}
       JWT_PRIVATE_KEY: ${{ secrets.JWT_PRIVATE_KEY }}
       FASTMAIL_API_TOKEN: ${{ secrets.FASTMAIL_API_TOKEN }}
       FASTMAIL_FROM_EMAIL: ${{ secrets.FASTMAIL_FROM_EMAIL }}
@@ -127,7 +125,7 @@ jobs:
           username: deploy
           key: ${{ secrets.DO_SSH_KEY }}
           script_stop: true
-          envs: AUTH_IMAGE,DISCORD_CLIENT_ID,DISCORD_CLIENT_SECRET,GOOGLE_CLIENT_ID,GOOGLE_CLIENT_SECRET,GH_OAUTH_CLIENT_ID,GH_OAUTH_CLIENT_SECRET,APPLE_SIGNIN_CLIENT_ID,APPLE_TEAM_ID,APPLE_SIGNIN_KEY_ID,APPLE_SIGNIN_PRIVATE_KEY,TWITCH_CLIENT_ID,TWITCH_CLIENT_SECRET,JWT_PRIVATE_KEY,FASTMAIL_API_TOKEN,FASTMAIL_FROM_EMAIL,FASTMAIL_FROM_NAME
+          envs: AUTH_IMAGE,DISCORD_CLIENT_ID,DISCORD_CLIENT_SECRET,GOOGLE_CLIENT_ID,GOOGLE_CLIENT_SECRET,GH_OAUTH_CLIENT_ID,GH_OAUTH_CLIENT_SECRET,APPLE_SIGNIN_CLIENT_ID,APPLE_TEAM_ID,APPLE_SIGNIN_KEY_ID,APPLE_SIGNIN_PRIVATE_KEY,JWT_PRIVATE_KEY,FASTMAIL_API_TOKEN,FASTMAIL_FROM_EMAIL,FASTMAIL_FROM_NAME
           script: |
             set -x
             cd /opt/eagle0
@@ -144,8 +142,6 @@ jobs:
             export APPLE_TEAM_ID="${APPLE_TEAM_ID}"
             export APPLE_SIGNIN_KEY_ID="${APPLE_SIGNIN_KEY_ID}"
             export APPLE_SIGNIN_PRIVATE_KEY="${APPLE_SIGNIN_PRIVATE_KEY}"
-            export TWITCH_CLIENT_ID="${TWITCH_CLIENT_ID}"
-            export TWITCH_CLIENT_SECRET="${TWITCH_CLIENT_SECRET}"
             export JWT_PRIVATE_KEY="${JWT_PRIVATE_KEY}"
             export FASTMAIL_API_TOKEN="${FASTMAIL_API_TOKEN}"
             export FASTMAIL_FROM_EMAIL="${FASTMAIL_FROM_EMAIL}"
@@ -160,39 +156,24 @@ jobs:
             echo "Pulling Auth image..."
             docker pull "${AUTH_IMAGE}" || { echo "ERROR: Failed to pull auth image"; exit 1; }
 
-            # Tag as :latest locally so any fallback uses correct image
-            docker tag "${AUTH_IMAGE}" registry.digitalocean.com/eagle0/auth-server:latest
-
-            # Debug: check environment and .env file
-            echo "DEBUG: AUTH_IMAGE=$AUTH_IMAGE"
-            env | grep AUTH || echo "AUTH_IMAGE not in env output"
-            if [ -f .env ]; then
-              echo "DEBUG: .env file contents related to AUTH:"
-              grep AUTH .env || echo "No AUTH in .env"
-            fi
-
-            # Recreate auth container - pass AUTH_IMAGE explicitly on command line
-            AUTH_IMAGE="${AUTH_IMAGE}" docker compose -f docker-compose.prod.yml up -d --no-deps --force-recreate auth
+            # Only recreate the auth container (not eagle, shardok, etc.)
+            docker compose -f docker-compose.prod.yml up -d --no-deps --force-recreate auth
 
             # Wait for health check
             sleep 5
 
             # Verify container is using the correct image
-            # Note: docker-compose may use :latest tag (which we tagged to the correct image)
             echo "=== Verifying auth container image ==="
             RUNNING_IMAGE=$(docker inspect auth-server --format '{{.Config.Image}}')
-            RUNNING_DIGEST=$(docker inspect auth-server --format '{{.Image}}')
-            EXPECTED_DIGEST=$(docker inspect "${AUTH_IMAGE}" --format '{{.Id}}')
             echo "Expected image: ${AUTH_IMAGE}"
             echo "Running image:  ${RUNNING_IMAGE}"
-            echo "Expected digest: ${EXPECTED_DIGEST}"
-            echo "Running digest:  ${RUNNING_DIGEST}"
 
-            if [ "$RUNNING_DIGEST" != "$EXPECTED_DIGEST" ]; then
+            if [ "$RUNNING_IMAGE" != "$AUTH_IMAGE" ]; then
               echo "ERROR: Container is running wrong image!"
+              echo "Container details:"
+              docker inspect auth-server --format '{{.Id}} {{.Config.Image}}'
               exit 1
             fi
-            echo "Image digests match - correct image is running"
 
             # Show container status
             docker compose -f docker-compose.prod.yml ps auth

.github/workflows/bazel_test.yml

@@ -33,9 +33,9 @@ jobs:
       uses: actions/checkout@v4
       with:
         lfs: false
-    - name: Check BUILD.bazel dependencies
-      run: ./scripts/check_build_deps.sh --strict
     - name: Run tests
+      id: test
+      continue-on-error: true
       run: bazel test --build_event_json_file=test.json //src/test/... //src/main/go/...
     - name: Collect failed test logs
       if: always()
@@ -75,7 +75,6 @@ jobs:
       with:
         name: test.json
         path: test.json
-        retention-days: 5
     - name: Archive failed test logs
       if: always()
       uses: actions/upload-artifact@v4
@@ -83,4 +82,6 @@ jobs:
         name: failed-test-logs
         path: failed_test_logs/
         if-no-files-found: ignore
-        retention-days: 5
+    - name: Fail if tests failed
+      if: steps.test.outcome == 'failure'
+      run: exit 1

.github/workflows/build_sysroot.yml

@@ -37,7 +37,6 @@ jobs:
         with:
           name: ubuntu-noble-sysroot-amd64
           path: tools/sysroot/output/
-          retention-days: 1
 
       - name: Install AWS CLI
         run: |
@@ -99,7 +98,6 @@ jobs:
         with:
           name: ubuntu-noble-sysroot-arm64
           path: tools/sysroot/output/
-          retention-days: 1
 
       - name: Install AWS CLI
         run: |

.github/workflows/docker_build.yml

@@ -5,17 +5,9 @@ on:
     branches: [ "main" ]
     paths:
       # Note: C++ changes trigger shardok_arm64_build.yml instead
-      # Note: Auth changes trigger auth_build.yml instead
-      # Note: Windows installer changes trigger installer_build.yml instead
       - 'src/main/go/**'
-      - '!src/main/go/net/eagle0/authservice/**'
-      - '!src/main/go/net/eagle0/authcli/**'
-      - '!src/main/go/net/eagle0/clients/**'
       - 'src/main/scala/**'
       - 'src/main/protobuf/**'
-      - '!src/main/protobuf/net/eagle0/eagle/api/auth.proto'
-      - '!src/main/protobuf/net/eagle0/eagle/api/admin/**'
-      - '!src/main/protobuf/net/eagle0/eagle/internal/auth_internal.proto'
       - 'src/main/resources/**'
       - 'ci/BUILD.bazel'
       - 'MODULE.bazel'
@@ -161,8 +153,6 @@ jobs:
       ADMIN_IMAGE: ${{ needs.build-all.outputs.admin_image_tag }}
       JFR_SIDECAR_IMAGE: ${{ needs.build-all.outputs.jfr_sidecar_image_tag }}
       OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
-      ANTHROPIC_API_KEY: ${{ secrets.ANTHROPIC_API_KEY }}
-      GEMINI_API_KEY: ${{ secrets.GEMINI_API_KEY }}
       GPT_MODEL_NAME: ${{ secrets.GPT_MODEL_NAME }}
       EAGLE_ENABLE_S3: ${{ secrets.EAGLE_ENABLE_S3 }}
       DO_SPACES_ACCESS_KEY: ${{ secrets.DO_SPACES_ACCESS_KEY }}
@@ -178,8 +168,6 @@ jobs:
       APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
       APPLE_SIGNIN_KEY_ID: ${{ secrets.APPLE_SIGNIN_KEY_ID }}
       APPLE_SIGNIN_PRIVATE_KEY: ${{ secrets.APPLE_SIGNIN_PRIVATE_KEY }}
-      TWITCH_CLIENT_ID: ${{ secrets.TWITCH_CLIENT_ID }}
-      TWITCH_CLIENT_SECRET: ${{ secrets.TWITCH_CLIENT_SECRET }}
       SHARDOK_ADDRESS: ${{ secrets.SHARDOK_ADDRESS }}
       SHARDOK_AUTH_TOKEN: ${{ secrets.SHARDOK_AUTH_TOKEN }}
       SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
@@ -210,15 +198,16 @@ jobs:
           # Create directory structure on remote
           ssh -i ~/.ssh/deploy_key deploy@"$DO_DROPLET_IP" bash -s << 'SETUP_DIRS'
           set -e
-          mkdir -p /opt/eagle0/scripts/bin /opt/eagle0/nginx
+          mkdir -p /opt/eagle0/scripts/bin /opt/eagle0/nginx /opt/eagle0/deploy
           rm -f /opt/eagle0/scripts/bin/warmup
           SETUP_DIRS
 
           # Copy files
           scp -i ~/.ssh/deploy_key docker-compose.prod.yml deploy@"$DO_DROPLET_IP":/opt/eagle0/
           scp -i ~/.ssh/deploy_key nginx/nginx.conf deploy@"$DO_DROPLET_IP":/opt/eagle0/nginx/
-          scp -i ~/.ssh/deploy_key scripts/deploy-blue-green.sh scripts/warmup-eagle.sh scripts/eagle-exec.sh scripts/eagle-logs.sh deploy@"$DO_DROPLET_IP":/opt/eagle0/scripts/
+          scp -i ~/.ssh/deploy_key scripts/deploy-blue-green.sh scripts/warmup-eagle.sh deploy@"$DO_DROPLET_IP":/opt/eagle0/scripts/
           scp -i ~/.ssh/deploy_key scripts/bin/warmup deploy@"$DO_DROPLET_IP":/opt/eagle0/scripts/bin/
+          scp -i ~/.ssh/deploy_key deploy/env.template deploy/update-env.sh deploy@"$DO_DROPLET_IP":/opt/eagle0/deploy/
 
       - name: Deploy to production droplet
         run: |
@@ -226,63 +215,12 @@ jobs:
           set -ex
           cd /opt/eagle0
 
-          # =================================================================
-          # CRITICAL: Validate environment variables before proceeding
-          # This catches GitHub Actions secret store hiccups early
-          # =================================================================
-          validate_env() {
-              local var_name="\$1"
-              local var_value="\$2"
-              local default_value="\${3:-}"
-
-              if [ -z "\${var_value}" ]; then
-                  echo "ERROR: \${var_name} is empty. GitHub Actions secrets may have failed to load."
-                  echo "Please retry the workflow."
-                  return 1
-              fi
-
-              # Check if we got a default value instead of the real secret
-              if [ -n "\${default_value}" ] && [ "\${var_value}" = "\${default_value}" ]; then
-                  echo "ERROR: \${var_name} has default value '\${default_value}' instead of the actual secret."
-                  echo "This indicates GitHub Actions secrets failed to load. Please retry the workflow."
-                  return 1
-              fi
-
-              return 0
-          }
-
-          echo "Validating critical environment variables..."
-
-          # These are the raw values from GitHub Actions (before export)
-          # We check them before exporting to catch issues early
-          VALIDATION_FAILED=0
-
-          validate_env "SHARDOK_ADDRESS" "${SHARDOK_ADDRESS}" "" || VALIDATION_FAILED=1
-          validate_env "EAGLE_IMAGE" "${EAGLE_IMAGE}" "" || VALIDATION_FAILED=1
-          validate_env "JWT_PRIVATE_KEY" "${JWT_PRIVATE_KEY}" "" || VALIDATION_FAILED=1
-          validate_env "DO_REGISTRY_TOKEN" "${DO_REGISTRY_TOKEN}" "" || VALIDATION_FAILED=1
-
-          if [ "\${VALIDATION_FAILED}" -eq 1 ]; then
-              echo ""
-              echo "========================================="
-              echo "DEPLOYMENT ABORTED: Missing critical secrets"
-              echo "This is likely a transient GitHub Actions issue."
-              echo "Please retry the workflow."
-              echo "========================================="
-              exit 1
-          fi
-
-          echo "All critical environment variables validated successfully."
-
-          # =================================================================
           # Export environment variables for docker compose
           # These are passed via heredoc and exported so child processes (docker compose) can access them
           export EAGLE_IMAGE="${EAGLE_IMAGE}"
           export ADMIN_IMAGE="${ADMIN_IMAGE}"
           export JFR_SIDECAR_IMAGE="${JFR_SIDECAR_IMAGE}"
           export OPENAI_API_KEY="${OPENAI_API_KEY}"
-          export ANTHROPIC_API_KEY="${ANTHROPIC_API_KEY}"
-          export GEMINI_API_KEY="${GEMINI_API_KEY}"
           export GPT_MODEL_NAME="${GPT_MODEL_NAME:-gpt-4o}"
           export EAGLE_ENABLE_S3="${EAGLE_ENABLE_S3:-false}"
           export DO_SPACES_ACCESS_KEY="${DO_SPACES_ACCESS_KEY}"
@@ -298,9 +236,7 @@ jobs:
           export APPLE_TEAM_ID="${APPLE_TEAM_ID}"
           export APPLE_SIGNIN_KEY_ID="${APPLE_SIGNIN_KEY_ID}"
           export APPLE_SIGNIN_PRIVATE_KEY="${APPLE_SIGNIN_PRIVATE_KEY}"
-          export TWITCH_CLIENT_ID="${TWITCH_CLIENT_ID}"
-          export TWITCH_CLIENT_SECRET="${TWITCH_CLIENT_SECRET}"
-          export SHARDOK_ADDRESS="${SHARDOK_ADDRESS}"
+          export SHARDOK_ADDRESS="${SHARDOK_ADDRESS:-shardok:40042}"
           export SHARDOK_AUTH_TOKEN="${SHARDOK_AUTH_TOKEN}"
           export SENTRY_DSN="${SENTRY_DSN}"
           export FASTMAIL_API_TOKEN="${FASTMAIL_API_TOKEN}"
@@ -340,43 +276,20 @@ jobs:
 
           echo "All images pulled successfully"
 
-          # =================================================================
-          # Verify Shardok connectivity before proceeding with deployment
-          # This catches network/firewall issues early
-          # =================================================================
-          echo "Verifying Shardok connectivity..."
-          SHARDOK_HOST=\$(echo "\${SHARDOK_ADDRESS}" | cut -d: -f1)
-          SHARDOK_PORT=\$(echo "\${SHARDOK_ADDRESS}" | cut -d: -f2)
-
-          # Try to connect to Shardok (timeout after 10 seconds)
-          if nc -z -w 10 "\${SHARDOK_HOST}" "\${SHARDOK_PORT}" 2>/dev/null; then
-              echo "Shardok connectivity verified: \${SHARDOK_ADDRESS} is reachable"
-          else
-              echo ""
-              echo "========================================="
-              echo "ERROR: Cannot reach Shardok at \${SHARDOK_ADDRESS}"
-              echo "This may indicate:"
-              echo "  - Shardok server is not running on Hetzner"
-              echo "  - Network/firewall issues between DigitalOcean and Hetzner"
-              echo "  - Incorrect SHARDOK_ADDRESS configuration"
-              echo ""
-              echo "DEPLOYMENT ABORTED: Shardok must be reachable for battles to work."
-              echo "========================================="
-              exit 1
-          fi
-
           # Stop local shardok container if running (now runs on Hetzner)
           docker stop shardok-server 2>/dev/null || true
           docker rm shardok-server 2>/dev/null || true
 
           # Deploy Eagle with blue-green (handles eagle, nginx, admin, jfr-sidecar)
           # Note: Shardok runs on Hetzner, deployed separately via shardok_arm64_build.yml
-          # Note: Auth is deployed separately via auth_build.yml - do NOT touch auth here
           chmod +x /opt/eagle0/scripts/*.sh
           [ -f "/opt/eagle0/scripts/bin/warmup" ] && chmod +x /opt/eagle0/scripts/bin/warmup
           GIT_SHA=\$(echo "\${EAGLE_IMAGE}" | sed 's/.*://')
           /opt/eagle0/scripts/deploy-blue-green.sh "\${GIT_SHA}"
 
+          # Ensure auth is running
+          docker compose -f docker-compose.prod.yml up -d auth
+
           # Verify
           sleep 10
           docker compose -f docker-compose.prod.yml ps

.github/workflows/eagle_build.yml

@@ -1,37 +0,0 @@
-name: Eagle Build
-
-on:
-  push:
-    branches: [ "main" ]
-    paths:
-      - 'src/main/scala/**'
-      - 'src/main/protobuf/net/eagle0/eagle/**'
-      - 'src/main/protobuf/net/eagle0/common/**'
-      - 'WORKSPACE'
-      - 'MODULE.bazel'
-      - 'BUILD.bazel'
-      - '.github/workflows/eagle_build.yml'
-  pull_request:
-    paths:
-      - 'src/main/scala/**'
-      - 'src/main/protobuf/net/eagle0/eagle/**'
-      - 'src/main/protobuf/net/eagle0/common/**'
-      - 'WORKSPACE'
-      - 'MODULE.bazel'
-      - 'BUILD.bazel'
-      - '.github/workflows/eagle_build.yml'
-
-permissions:
-  contents: read
-
-jobs:
-  build:
-    runs-on: [self-hosted, bazel]
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          lfs: false
-      - name: Build Eagle server
-        run: bazel build //src/main/scala/net/eagle0/eagle:eagle_server

.github/workflows/installer_build.yml

@@ -5,16 +5,15 @@ on:
     branches: [ "main" ]
     paths:
       - ".github/workflows/installer_build.yml"
-      - "src/main/go/net/eagle0/clients/win/installer/**"
+      - "src/main/csharp/net/eagle0/clients/win/installer/**"
   pull_request:
     paths:
       - ".github/workflows/installer_build.yml"
-      - "src/main/go/net/eagle0/clients/win/installer/**"
+      - "src/main/csharp/net/eagle0/clients/win/installer/**"
   workflow_dispatch:
 
 permissions:
   contents: read
-  actions: write  # Required to delete artifacts after deploy
 
 jobs:
   build-installer:
@@ -26,47 +25,47 @@ jobs:
           lfs: false
           clean: false
 
-      - name: Build Go installer for Windows
+      - name: Setup .NET 8
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: '8.0.x'
+
+      - name: Inject manifest public key
         env:
           MANIFEST_PUBLIC_KEY: ${{ secrets.MANIFEST_PUBLIC_KEY }}
         run: |
-          # Require manifest public key for production builds
-          if [ -z "$MANIFEST_PUBLIC_KEY" ]; then
-            echo "ERROR: MANIFEST_PUBLIC_KEY secret is not set"
-            echo "The installer requires a public key for manifest signature verification"
-            exit 1
+          if [ -n "$MANIFEST_PUBLIC_KEY" ]; then
+            CONFIG_FILE="src/main/csharp/net/eagle0/clients/win/installer/EagleInstaller/configuration.txt"
+            echo "manifest_public_key = $MANIFEST_PUBLIC_KEY" >> "$CONFIG_FILE"
+            echo "Injected manifest public key into configuration.txt"
+            cat "$CONFIG_FILE"
+          else
+            echo "MANIFEST_PUBLIC_KEY not set, skipping injection"
           fi
 
-          # Build Windows installer with WebView GUI (uses CGO cross-compilation)
-          # Use --action_env to pass the signing key into the genrule sandbox
-          bazel build //src/main/go/net/eagle0/clients/win/installer:eagle_installer_windows_amd64_webview --stamp --action_env=MANIFEST_PUBLIC_KEY
+      - name: Restore dependencies
+        run: dotnet restore src/main/csharp/net/eagle0/clients/win/installer/EagleInstaller/EagleInstaller.csproj
 
-          # Copy to output directory
-          rm -rf ./installer-output
-          mkdir -p ./installer-output
-          cp bazel-bin/src/main/go/net/eagle0/clients/win/installer/Eagle0.exe ./installer-output/Eagle0.exe
-
-          echo "Go installer size: $(ls -lh ./installer-output/Eagle0.exe | awk '{print $5}')"
+      - name: Build installer
+        run: dotnet publish src/main/csharp/net/eagle0/clients/win/installer/EagleInstaller/EagleInstaller.csproj -c Release -r win-x64 --self-contained true --output ./installer-output
 
       - name: Archive installer binary
         if: success() || failure()
         uses: actions/upload-artifact@v4
         with:
           name: eagle-installer
-          path: ./installer-output/
-          retention-days: 1
+          path: ./installer-output/EagleInstaller.exe
 
       - name: Verify installer exists
         if: success()
         run: |
-          echo "=== Installer output directory ==="
-          ls -lh ./installer-output/
-
-          if [ ! -f "./installer-output/Eagle0.exe" ]; then
-            echo "ERROR: Eagle0.exe not found"
+          if [ ! -f "./installer-output/EagleInstaller.exe" ]; then
+            echo "ERROR: EagleInstaller.exe not found at expected location"
+            echo "Directory contents:"
+            ls -la ./installer-output/
             exit 1
           fi
-          echo "Installer found"
+          echo "Installer found at correct location"
 
       - name: Deploy installer
         if: success() && github.ref == 'refs/heads/main' && github.event_name == 'push'
@@ -74,24 +73,25 @@ jobs:
           ACCESS_KEY_ID: ${{ secrets.ACCESS_KEY_ID }}
           SECRET_KEY: ${{ secrets.SECRET_KEY }}
         run: |
-          INSTALLER_PATH="$(pwd)/installer-output/Eagle0.exe"
-          echo "Deploying Go installer to installer/Eagle0.exe"
-          bazel run //src/main/go/net/eagle0/build/installer_build_handler:installer_build_handler -- "$INSTALLER_PATH" "installer/Eagle0.exe"
+          INSTALLER_PATH="$(pwd)/installer-output/EagleInstaller.exe"
+          echo "Using absolute path: $INSTALLER_PATH"
+          bazel run //src/main/go/net/eagle0/build/installer_build_handler:installer_build_handler -- "$INSTALLER_PATH"
 
-      - name: Update manifest
+      - name: Update unified manifest
         if: success() && github.ref == 'refs/heads/main' && github.event_name == 'push'
         env:
           ACCESS_KEY_ID: ${{ secrets.ACCESS_KEY_ID }}
           SECRET_KEY: ${{ secrets.SECRET_KEY }}
           MANIFEST_SIGNING_KEY: ${{ secrets.MANIFEST_SIGNING_KEY }}
         run: |
-          INSTALLER_SHA=$(sha256sum ./installer-output/Eagle0.exe | cut -d' ' -f1)
+          # Create installer manifest content
+          INSTALLER_SHA=$(sha256sum ./installer-output/EagleInstaller.exe | cut -d' ' -f1)
           echo "installer_version=$INSTALLER_SHA" > /tmp/installer_manifest.txt
-          echo "installer_url=installer/Eagle0.exe" >> /tmp/installer_manifest.txt
+          echo "installer_url=installer/EagleInstaller.exe" >> /tmp/installer_manifest.txt
 
-          echo "=== Manifest content ==="
+          echo "=== Installer manifest content ==="
           cat /tmp/installer_manifest.txt
-          echo "========================"
+          echo "=================================="
 
           # Write signing key to temp file (if available)
           SIGNING_ARGS=""
@@ -104,22 +104,8 @@ jobs:
             echo "Warning: MANIFEST_SIGNING_KEY not set, manifest will be unsigned"
           fi
 
-          # Update the v2 manifest at installer/v2/eagle0_manifest.txt
-          bazel run //src/main/go/net/eagle0/build/manifest_manager:manifest_manager -- installer-v2 /tmp/installer_manifest.txt $SIGNING_ARGS
+          # Update the unified manifest (with optional signing)
+          bazel run //src/main/go/net/eagle0/build/manifest_manager:manifest_manager -- installer /tmp/installer_manifest.txt $SIGNING_ARGS
 
-          rm -f /tmp/manifest_signing_key
-
-      - name: Delete all installer artifacts
-        if: success() && github.ref == 'refs/heads/main' && github.event_name == 'push'
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: |
-          # Delete ALL eagle-installer artifacts to free up storage
-          echo "Fetching all eagle-installer artifacts..."
-          artifact_ids=$(gh api "repos/${{ github.repository }}/actions/artifacts" \
-            --paginate -q '.artifacts[] | select(.name == "eagle-installer") | .id')
-          for id in $artifact_ids; do
-            echo "Deleting artifact ID: $id"
-            gh api -X DELETE "repos/${{ github.repository }}/actions/artifacts/$id" || true
-          done
-          echo "Cleanup complete"
+          # Cleanup
+          rm -f /tmp/manifest_signing_key

.github/workflows/ios_addressables_build.yml

@@ -1,66 +0,0 @@
-name: iOS Addressables Build
-
-on:
-  push:
-    branches: [ "main" ]
-    paths:
-      - ".github/workflows/ios_addressables_build.yml"
-      - "src/main/csharp/net/eagle0/clients/unity/eagle0/Assets/AddressableAssetsData/**"
-      - "src/main/csharp/net/eagle0/clients/unity/eagle0/Assets/Music/**"
-      - "src/main/csharp/net/eagle0/clients/unity/eagle0/Assets/Editor/BuildScript.cs"
-      - "ci/github_actions/build_ios_addressables.sh"
-      - "ci/github_actions/upload_addressables.sh"
-  pull_request:
-    paths:
-      - ".github/workflows/ios_addressables_build.yml"
-      - "src/main/csharp/net/eagle0/clients/unity/eagle0/Assets/AddressableAssetsData/**"
-      - "src/main/csharp/net/eagle0/clients/unity/eagle0/Assets/Music/**"
-      - "src/main/csharp/net/eagle0/clients/unity/eagle0/Assets/Editor/BuildScript.cs"
-      - "ci/github_actions/build_ios_addressables.sh"
-      - "ci/github_actions/upload_addressables.sh"
-  workflow_dispatch:
-
-permissions:
-  contents: read
-
-jobs:
-  build-ios-addressables:
-    runs-on: [self-hosted, macOS, unity-mac]
-
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          lfs: true
-          clean: true
-
-      - name: Pull LFS files
-        run: git lfs pull
-
-      - name: Restore Library/
-        env:
-          UNITY_CACHE_PLATFORM: ios
-        run: ./ci/github_actions/restore_library.sh
-
-      - name: Build iOS Addressables
-        run: ./ci/github_actions/build_ios_addressables.sh "/tmp/eagle0/editor_ios_addressables.log"
-
-      - name: Persist Library/
-        if: success()
-        env:
-          UNITY_CACHE_PLATFORM: ios
-        run: ./ci/github_actions/persist_library.sh
-
-      - name: Upload Addressables to CDN
-        if: success() && github.ref == 'refs/heads/main' && github.event_name != 'pull_request'
-        env:
-          ACCESS_KEY_ID: ${{ secrets.ACCESS_KEY_ID }}
-          SECRET_KEY: ${{ secrets.SECRET_KEY }}
-        run: ./ci/github_actions/upload_addressables.sh iOS
-
-      - name: Archive Build Log
-        if: success() || failure()
-        uses: actions/upload-artifact@v4
-        with:
-          name: editor_ios_addressables.log
-          path: /tmp/eagle0/editor_ios_addressables.log
-          retention-days: 5

.github/workflows/mac_build.yml

@@ -20,7 +20,6 @@ on:
       - "scripts/notarize_wait.sh"
       - "ci/github_actions/build_mac.sh"
       - "ci/github_actions/build_unity_mac.sh"
-      - "ci/github_actions/upload_addressables.sh"
       - "ci/mac/**"
   pull_request:
     paths:
@@ -39,7 +38,6 @@ on:
       - "scripts/notarize_wait.sh"
       - "ci/github_actions/build_mac.sh"
       - "ci/github_actions/build_unity_mac.sh"
-      - "ci/github_actions/upload_addressables.sh"
       - "ci/mac/**"
   workflow_dispatch:
     inputs:
@@ -51,7 +49,6 @@ on:
 
 permissions:
   contents: read
-  actions: write  # Required to delete artifacts after deploy
 
 jobs:
   build-and-sign:
@@ -84,13 +81,6 @@ jobs:
           UNITY_CACHE_PLATFORM: mac
         run: ./ci/github_actions/persist_library.sh
 
-      - name: Upload Addressables to CDN
-        if: success() && github.ref == 'refs/heads/main' && github.event_name != 'pull_request'
-        env:
-          ACCESS_KEY_ID: ${{ secrets.ACCESS_KEY_ID }}
-          SECRET_KEY: ${{ secrets.SECRET_KEY }}
-        run: ./ci/github_actions/upload_addressables.sh StandaloneOSX
-
       - name: Inject Sparkle Framework
         if: success()
         env:
@@ -176,7 +166,7 @@ jobs:
         if: success() && steps.check-deploy.outputs.should_deploy == 'true'
         uses: actions/upload-artifact@v4
         with:
-          name: signed-mac-app-${{ github.run_id }}
+          name: signed-mac-app
           path: /tmp/eagle0/eagle0MAC/eagle0.app.zip
           retention-days: 1
 
@@ -186,7 +176,6 @@ jobs:
         with:
           name: editor_mac.log
           path: /tmp/eagle0/editor_mac.log
-          retention-days: 5
 
   wait-notarization:
     needs: build-and-sign
@@ -204,7 +193,7 @@ jobs:
       - name: Download signed app
         uses: actions/download-artifact@v4
         with:
-          name: signed-mac-app-${{ github.run_id }}
+          name: signed-mac-app
           path: /tmp/eagle0/eagle0MAC
 
       - name: Unzip signed app
@@ -232,7 +221,7 @@ jobs:
       - name: Upload notarized app
         uses: actions/upload-artifact@v4
         with:
-          name: notarized-mac-app-${{ github.run_id }}
+          name: notarized-mac-app
           path: /tmp/eagle0/eagle0MAC/eagle0.app.zip
           retention-days: 1
 
@@ -252,7 +241,7 @@ jobs:
       - name: Download notarized app
         uses: actions/download-artifact@v4
         with:
-          name: notarized-mac-app-${{ github.run_id }}
+          name: notarized-mac-app
           path: /tmp/eagle0/eagle0MAC
 
       - name: Unzip notarized app
@@ -272,61 +261,13 @@ jobs:
           echo "$SPARKLE_EDDSA_PRIVATE_KEY" > "$SPARKLE_PRIVATE_KEY_PATH"
           chmod 600 "$SPARKLE_PRIVATE_KEY_PATH"
 
-          # Install dmgbuild (creates .DS_Store programmatically, no AppleScript needed)
-          pip3 install dmgbuild
-
-          # Background image for styled DMG
-          BACKGROUND_PATH="$(pwd)/ci/mac/dmg/background.png"
-
-          # Read version from the built app's Info.plist to ensure appcast matches the actual app
-          APP_PATH="/tmp/eagle0/eagle0MAC/eagle0.app"
-          BUILD_NUMBER=$(/usr/libexec/PlistBuddy -c "Print :CFBundleVersion" "$APP_PATH/Contents/Info.plist")
-          VERSION=$(/usr/libexec/PlistBuddy -c "Print :CFBundleShortVersionString" "$APP_PATH/Contents/Info.plist")
+          VERSION=$(git describe --tags --always)
+          BUILD_NUMBER=$(git rev-list --count HEAD)
 
           bazel run //src/main/go/net/eagle0/build/mac_build_handler:mac_build_handler -- \
             "/tmp/eagle0/eagle0MAC/eagle0.app" \
             "$VERSION" \
             "$BUILD_NUMBER" \
-            "$BACKGROUND_PATH" \
             "$SPARKLE_PRIVATE_KEY_PATH"
 
           rm "$SPARKLE_PRIVATE_KEY_PATH"
-
-      - name: Delete this run's Mac app artifacts
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: |
-          # Delete this run's artifacts (names include run ID to avoid conflicts)
-          for artifact_name in signed-mac-app-${{ github.run_id }} notarized-mac-app-${{ github.run_id }}; do
-            echo "Deleting artifact: $artifact_name"
-            artifact_id=$(gh api "repos/${{ github.repository }}/actions/runs/${{ github.run_id }}/artifacts" \
-              -q ".artifacts[] | select(.name == \"$artifact_name\") | .id")
-            if [ -n "$artifact_id" ]; then
-              echo "Deleting artifact ID: $artifact_id"
-              gh api -X DELETE "repos/${{ github.repository }}/actions/artifacts/$artifact_id" || true
-            fi
-          done
-          echo "Cleanup complete"
-
-  # Cleanup job runs regardless of success/failure to prevent artifact accumulation
-  cleanup:
-    needs: [build-and-sign, wait-notarization, deploy]
-    if: always()
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Delete this run's Mac app artifacts
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: |
-          # Delete this run's artifacts (names include run ID to avoid conflicts)
-          for artifact_name in signed-mac-app-${{ github.run_id }} notarized-mac-app-${{ github.run_id }}; do
-            echo "Deleting artifact: $artifact_name"
-            artifact_id=$(gh api "repos/${{ github.repository }}/actions/runs/${{ github.run_id }}/artifacts" \
-              -q ".artifacts[] | select(.name == \"$artifact_name\") | .id")
-            if [ -n "$artifact_id" ]; then
-              echo "Deleting artifact ID: $artifact_id"
-              gh api -X DELETE "repos/${{ github.repository }}/actions/artifacts/$artifact_id" || true
-            fi
-          done
-          echo "Cleanup complete"

.github/workflows/unity_build.yml

@@ -17,7 +17,6 @@ on:
       - "ci/github_actions/build_unity.sh"
       - "ci/github_actions/restore_library.sh"
       - "ci/github_actions/persist_library.sh"
-      - "ci/github_actions/upload_addressables.sh"
       - "MODULE.bazel"
       - "WORKSPACE"
   workflow_dispatch:
@@ -36,7 +35,6 @@ on:
       - "ci/github_actions/build_unity.sh"
       - "ci/github_actions/restore_library.sh"
       - "ci/github_actions/persist_library.sh"
-      - "ci/github_actions/upload_addressables.sh"
       - "MODULE.bazel"
       - "WORKSPACE"
 
@@ -65,12 +63,6 @@ jobs:
         env:
           UNITY_CACHE_PLATFORM: windows
         run: ./ci/github_actions/persist_library.sh
-      - name: Upload Addressables to CDN
-        if: success() && github.ref == 'refs/heads/main' && github.event_name != 'pull_request'
-        env:
-          ACCESS_KEY_ID: ${{ secrets.ACCESS_KEY_ID }}
-          SECRET_KEY: ${{ secrets.SECRET_KEY }}
-        run: ./ci/github_actions/upload_addressables.sh StandaloneWindows64
       - name: Deploy Windows unity
         if: success() && github.ref == 'refs/heads/main' && github.event_name == 'push'
         env:
@@ -96,8 +88,8 @@ jobs:
             echo "Warning: MANIFEST_SIGNING_KEY not set, manifest will be unsigned"
           fi
 
-          # Update the v2 manifest at installer/v2/eagle0_manifest.txt
-          bazel run //src/main/go/net/eagle0/build/manifest_manager:manifest_manager -- unity3d-v2 /tmp/unity_manifest.txt $SIGNING_ARGS
+          # Update the unified manifest (with optional signing)
+          bazel run //src/main/go/net/eagle0/build/manifest_manager:manifest_manager -- unity3d /tmp/unity_manifest.txt $SIGNING_ARGS
 
           # Cleanup
           rm -f /tmp/manifest_signing_key
@@ -106,5 +98,4 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: editor_win.log
-          path: /tmp/eagle0/editor_win.log
-          retention-days: 5
+          path: /tmp/eagle0/editor_win.log

BUILD.bazel

@@ -32,15 +32,3 @@ nogo(
     vet = True,
     visibility = ["//visibility:public"],
 )
-
-# Dependency constraint tests
-# These verify architectural boundaries are maintained
-sh_test(
-    name = "build_deps_test",
-    srcs = ["scripts/check_build_deps.sh"],
-    args = ["--ci"],
-    tags = [
-        "local",  # Needs bazel query access
-        "no-sandbox",
-    ],
-)

MODULE.bazel

@@ -107,7 +107,6 @@ bazel_dep(name = "gazelle", version = "0.47.0", repo_name = "bazel_gazelle")
 
 go_sdk = use_extension("@io_bazel_rules_go//go:extensions.bzl", "go_sdk")
 go_sdk.download(version = "1.23.3")
-use_repo(go_sdk, "go_default_sdk")
 
 go_deps = use_extension("@bazel_gazelle//:extensions.bzl", "go_deps")
 go_deps.from_file(go_mod = "//:go.mod")
@@ -119,10 +118,8 @@ use_repo(
     "com_github_aws_aws_sdk_go_v2_service_s3",
     "com_github_golang_jwt_jwt_v5",
     "com_github_google_uuid",
-    "com_github_webview_webview_go",
     "org_golang_google_grpc",
     "org_golang_google_protobuf",
-    "org_golang_x_sys",
 )
 
 #
@@ -339,19 +336,6 @@ http_file(
     executable = True,
 )
 
-# LLVM MinGW toolchain for Windows cross-compilation from macOS
-# This provides a complete toolchain for building Windows executables including
-# the MinGW-w64 libraries needed for CGO cross-compilation
-LLVM_MINGW_VERSION = "20250305"
-
-http_archive(
-    name = "llvm_mingw",
-    build_file = "@//external:BUILD.llvm_mingw",
-    sha256 = "32c24fc62fc8b9f8a900bf2c730b78b36767688f816f9d21e97a168289ff44e0",
-    strip_prefix = "llvm-mingw-%s-ucrt-macos-14.4.1-universal" % LLVM_MINGW_VERSION,
-    urls = ["https://github.com/fathonix/llvm-mingw-arm64ec-macos/releases/download/%s/llvm-mingw-%s-ucrt-macos-14.4.1-universal.tar.xz" % (LLVM_MINGW_VERSION, LLVM_MINGW_VERSION)],
-)
-
 #
 # Toolchain Registration
 #

MODULE.bazel.lock

@@ -611,445 +611,6 @@
         ]
       }
     },
-    "@@aspect_rules_js~//npm:extensions.bzl%pnpm": {
-      "general": {
-        "bzlTransitiveDigest": "T22SdPzhLxF1CM+j9RD/Rq03yJ0NDfH2eE6hAbUcOII=",
-        "usagesDigest": "6rWte4KDbiluq1s7w98bc4+2NjA8w67DKHDj4+DNw/Y=",
-        "recordedFileInputs": {},
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "pnpm": {
-            "bzlFile": "@@aspect_rules_js~//npm/private:npm_import.bzl",
-            "ruleClassName": "npm_import_rule",
-            "attributes": {
-              "package": "pnpm",
-              "version": "8.6.7",
-              "root_package": "",
-              "link_workspace": "",
-              "link_packages": {},
-              "integrity": "sha512-vRIWpD/L4phf9Bk2o/O2TDR8fFoJnpYrp2TKqTIZF/qZ2/rgL3qKXzHofHgbXsinwMoSEigz28sqk3pQ+yMEQQ==",
-              "url": "",
-              "commit": "",
-              "patch_args": [
-                "-p0"
-              ],
-              "patches": [],
-              "custom_postinstall": "",
-              "npm_auth": "",
-              "npm_auth_basic": "",
-              "npm_auth_username": "",
-              "npm_auth_password": "",
-              "lifecycle_hooks": [],
-              "extra_build_content": "load(\"@aspect_rules_js//js:defs.bzl\", \"js_binary\")\njs_binary(name = \"pnpm\", data = glob([\"package/**\"]), entry_point = \"package/dist/pnpm.cjs\", visibility = [\"//visibility:public\"])",
-              "generate_bzl_library_targets": false,
-              "extract_full_archive": true,
-              "exclude_package_contents": [],
-              "system_tar": "auto"
-            }
-          },
-          "pnpm__links": {
-            "bzlFile": "@@aspect_rules_js~//npm/private:npm_import.bzl",
-            "ruleClassName": "npm_import_links",
-            "attributes": {
-              "package": "pnpm",
-              "version": "8.6.7",
-              "dev": false,
-              "root_package": "",
-              "link_packages": {},
-              "deps": {},
-              "transitive_closure": {},
-              "lifecycle_build_target": false,
-              "lifecycle_hooks_env": [],
-              "lifecycle_hooks_execution_requirements": [
-                "no-sandbox"
-              ],
-              "lifecycle_hooks_use_default_shell_env": false,
-              "bins": {},
-              "package_visibility": [
-                "//visibility:public"
-              ],
-              "replace_package": "",
-              "exclude_package_contents": []
-            }
-          }
-        },
-        "recordedRepoMappingEntries": [
-          [
-            "aspect_bazel_lib~",
-            "bazel_lib",
-            "bazel_lib~"
-          ],
-          [
-            "aspect_bazel_lib~",
-            "bazel_skylib",
-            "bazel_skylib~"
-          ],
-          [
-            "aspect_bazel_lib~",
-            "bazel_tools",
-            "bazel_tools"
-          ],
-          [
-            "aspect_bazel_lib~",
-            "tar.bzl",
-            "tar.bzl~"
-          ],
-          [
-            "aspect_rules_js~",
-            "aspect_bazel_lib",
-            "aspect_bazel_lib~"
-          ],
-          [
-            "aspect_rules_js~",
-            "aspect_rules_js",
-            "aspect_rules_js~"
-          ],
-          [
-            "aspect_rules_js~",
-            "bazel_features",
-            "bazel_features~"
-          ],
-          [
-            "aspect_rules_js~",
-            "bazel_skylib",
-            "bazel_skylib~"
-          ],
-          [
-            "aspect_rules_js~",
-            "bazel_tools",
-            "bazel_tools"
-          ],
-          [
-            "bazel_features~",
-            "bazel_features_globals",
-            "bazel_features~~version_extension~bazel_features_globals"
-          ],
-          [
-            "bazel_features~",
-            "bazel_features_version",
-            "bazel_features~~version_extension~bazel_features_version"
-          ],
-          [
-            "bazel_lib~",
-            "bazel_skylib",
-            "bazel_skylib~"
-          ],
-          [
-            "bazel_lib~",
-            "bazel_tools",
-            "bazel_tools"
-          ],
-          [
-            "tar.bzl~",
-            "aspect_bazel_lib",
-            "aspect_bazel_lib~"
-          ],
-          [
-            "tar.bzl~",
-            "bazel_skylib",
-            "bazel_skylib~"
-          ],
-          [
-            "tar.bzl~",
-            "tar.bzl",
-            "tar.bzl~"
-          ]
-        ]
-      }
-    },
-    "@@aspect_rules_ts~//ts:extensions.bzl%ext": {
-      "general": {
-        "bzlTransitiveDigest": "h1hftyFCdJgiHD9blfFcMAiEk5ltEoUdNkuHPIkg/hM=",
-        "usagesDigest": "v0aTa4/gasWF2bvssXYr1bqcYWc3kjV48hcj0z2QVT0=",
-        "recordedFileInputs": {},
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "npm_typescript": {
-            "bzlFile": "@@aspect_rules_ts~//ts/private:npm_repositories.bzl",
-            "ruleClassName": "http_archive_version",
-            "attributes": {
-              "bzlmod": true,
-              "version": "5.8.3",
-              "integrity": "",
-              "build_file": "@@aspect_rules_ts~//ts:BUILD.typescript",
-              "build_file_substitutions": {
-                "bazel_worker_version": "5.4.2",
-                "google_protobuf_version": "3.20.1"
-              },
-              "urls": [
-                "https://registry.npmjs.org/typescript/-/typescript-{}.tgz"
-              ]
-            }
-          }
-        },
-        "recordedRepoMappingEntries": [
-          [
-            "aspect_rules_ts~",
-            "bazel_tools",
-            "bazel_tools"
-          ]
-        ]
-      }
-    },
-    "@@cel-spec~//:extensions.bzl%non_module_dependencies": {
-      "general": {
-        "bzlTransitiveDigest": "/2uyuQa5purSharolRXYOGYMGSGjDeByo6JfQDWsraA=",
-        "usagesDigest": "2f6juplOpWu+UdD1kVgi773xavnFQ+OcH0PRuQduDxY=",
-        "recordedFileInputs": {},
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "com_google_googleapis": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "sha256": "bd8e735d881fb829751ecb1a77038dda4a8d274c45490cb9fcf004583ee10571",
-              "strip_prefix": "googleapis-07c27163ac591955d736f3057b1619ece66f5b99",
-              "urls": [
-                "https://github.com/googleapis/googleapis/archive/07c27163ac591955d736f3057b1619ece66f5b99.tar.gz"
-              ]
-            }
-          }
-        },
-        "recordedRepoMappingEntries": [
-          [
-            "cel-spec~",
-            "bazel_tools",
-            "bazel_tools"
-          ]
-        ]
-      }
-    },
-    "@@cel-spec~//:googleapis_ext.bzl%googleapis_ext": {
-      "general": {
-        "bzlTransitiveDigest": "yun2jmsomFi3bs5bjQWXApBzqQf66zBJ39JEBYigzdc=",
-        "usagesDigest": "OK8FsLndSl2AbwGM1Npe5NdHR1kDAebcw7Ee+KkekE0=",
-        "recordedFileInputs": {},
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "com_google_googleapis_imports": {
-            "bzlFile": "@@cel-spec~~non_module_dependencies~com_google_googleapis//:repository_rules.bzl",
-            "ruleClassName": "switched_rules",
-            "attributes": {
-              "rules": {
-                "proto_library_with_info": [
-                  "",
-                  ""
-                ],
-                "moved_proto_library": [
-                  "",
-                  ""
-                ],
-                "java_proto_library": [
-                  "",
-                  ""
-                ],
-                "java_grpc_library": [
-                  "",
-                  ""
-                ],
-                "java_gapic_library": [
-                  "",
-                  ""
-                ],
-                "java_gapic_test": [
-                  "",
-                  ""
-                ],
-                "java_gapic_assembly_gradle_pkg": [
-                  "",
-                  ""
-                ],
-                "py_proto_library": [
-                  "",
-                  ""
-                ],
-                "py_grpc_library": [
-                  "",
-                  ""
-                ],
-                "py_gapic_library": [
-                  "",
-                  ""
-                ],
-                "py_test": [
-                  "",
-                  ""
-                ],
-                "py_gapic_assembly_pkg": [
-                  "",
-                  ""
-                ],
-                "py_import": [
-                  "",
-                  ""
-                ],
-                "go_proto_library": [
-                  "",
-                  ""
-                ],
-                "go_library": [
-                  "",
-                  ""
-                ],
-                "go_test": [
-                  "",
-                  ""
-                ],
-                "go_gapic_library": [
-                  "",
-                  ""
-                ],
-                "go_gapic_assembly_pkg": [
-                  "",
-                  ""
-                ],
-                "cc_proto_library": [
-                  "native.cc_proto_library",
-                  ""
-                ],
-                "cc_grpc_library": [
-                  "",
-                  ""
-                ],
-                "cc_gapic_library": [
-                  "",
-                  ""
-                ],
-                "php_proto_library": [
-                  "",
-                  "php_proto_library"
-                ],
-                "php_grpc_library": [
-                  "",
-                  "php_grpc_library"
-                ],
-                "php_gapic_library": [
-                  "",
-                  "php_gapic_library"
-                ],
-                "php_gapic_assembly_pkg": [
-                  "",
-                  "php_gapic_assembly_pkg"
-                ],
-                "nodejs_gapic_library": [
-                  "",
-                  "typescript_gapic_library"
-                ],
-                "nodejs_gapic_assembly_pkg": [
-                  "",
-                  "typescript_gapic_assembly_pkg"
-                ],
-                "ruby_proto_library": [
-                  "",
-                  ""
-                ],
-                "ruby_grpc_library": [
-                  "",
-                  ""
-                ],
-                "ruby_ads_gapic_library": [
-                  "",
-                  ""
-                ],
-                "ruby_cloud_gapic_library": [
-                  "",
-                  ""
-                ],
-                "ruby_gapic_assembly_pkg": [
-                  "",
-                  ""
-                ],
-                "csharp_proto_library": [
-                  "",
-                  ""
-                ],
-                "csharp_grpc_library": [
-                  "",
-                  ""
-                ],
-                "csharp_gapic_library": [
-                  "",
-                  ""
-                ],
-                "csharp_gapic_assembly_pkg": [
-                  "",
-                  ""
-                ]
-              }
-            }
-          }
-        },
-        "recordedRepoMappingEntries": [
-          [
-            "cel-spec~",
-            "com_google_googleapis",
-            "cel-spec~~non_module_dependencies~com_google_googleapis"
-          ]
-        ]
-      }
-    },
-    "@@envoy_api~//bazel:repositories.bzl%non_module_deps": {
-      "general": {
-        "bzlTransitiveDigest": "6TqmRfVELxZJRPQYuJpC4JBX4QvdrHqTDOUJGOGODSo=",
-        "usagesDigest": "IivjlawPvqhHPUJ3c6dLiPsH22mn/g/dJtlmv3zdimM=",
-        "recordedFileInputs": {},
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "prometheus_metrics_model": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "urls": [
-                "https://github.com/prometheus/client_model/archive/v0.6.1.tar.gz"
-              ],
-              "sha256": "b9b690bc35d80061f255faa7df7621eae39fe157179ccd78ff6409c3b004f05e",
-              "strip_prefix": "client_model-0.6.1",
-              "build_file_content": "\nload(\"@envoy_api//bazel:api_build_system.bzl\", \"api_cc_py_proto_library\")\nload(\"@io_bazel_rules_go//proto:def.bzl\", \"go_proto_library\")\n\napi_cc_py_proto_library(\n    name = \"client_model\",\n    srcs = [\n        \"io/prometheus/client/metrics.proto\",\n    ],\n    visibility = [\"//visibility:public\"],\n)\n\ngo_proto_library(\n    name = \"client_model_go_proto\",\n    importpath = \"github.com/prometheus/client_model/go\",\n    proto = \":client_model\",\n    visibility = [\"//visibility:public\"],\n)\n"
-            }
-          },
-          "com_github_bufbuild_buf": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "urls": [
-                "https://github.com/bufbuild/buf/releases/download/v1.49.0/buf-Linux-x86_64.tar.gz"
-              ],
-              "sha256": "ee8da9748249f7946d79191e36469ce7bc3b8ba80019bff1fa4289a44cbc23bf",
-              "strip_prefix": "buf",
-              "build_file_content": "\npackage(\n    default_visibility = [\"//visibility:public\"],\n)\n\nfilegroup(\n    name = \"buf\",\n    srcs = [\n        \"@com_github_bufbuild_buf//:bin/buf\",\n    ],\n    tags = [\"manual\"], # buf is downloaded as a linux binary; tagged manual to prevent build for non-linux users\n)\n"
-            }
-          },
-          "envoy_toolshed": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "urls": [
-                "https://github.com/envoyproxy/toolshed/archive/bazel-v0.2.2.tar.gz"
-              ],
-              "sha256": "443fe177aba0cef8c17b7a48905c925c67b09005b10dd70ff12cd9f729a72d51",
-              "strip_prefix": "toolshed-bazel-v0.2.2/bazel"
-            }
-          }
-        },
-        "recordedRepoMappingEntries": [
-          [
-            "envoy_api~",
-            "bazel_tools",
-            "bazel_tools"
-          ],
-          [
-            "envoy_api~",
-            "envoy_api",
-            "envoy_api~"
-          ]
-        ]
-      }
-    },
     "@@googleapis~//:extensions.bzl%switched_rules": {
       "general": {
         "bzlTransitiveDigest": "vG6fuTzXD8MMvHWZEQud0MMH7eoC4GXY0va7VrFFh04=",
@@ -1218,37 +779,6 @@
         "recordedRepoMappingEntries": []
       }
     },
-    "@@pybind11_bazel~//:internal_configure.bzl%internal_configure_extension": {
-      "general": {
-        "bzlTransitiveDigest": "CyAKLVVonohnkTSqg9II/HA7M49sOlnMkgMHL3CmDuc=",
-        "usagesDigest": "mFrTHX5eCiNU/OIIGVHH3cOILY9Zmjqk8RQYv8o6Thk=",
-        "recordedFileInputs": {
-          "@@pybind11_bazel~//MODULE.bazel": "e6f4c20442eaa7c90d7190d8dc539d0ab422f95c65a57cc59562170c58ae3d34"
-        },
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "pybind11": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file": "@@pybind11_bazel~//:pybind11-BUILD.bazel",
-              "strip_prefix": "pybind11-2.12.0",
-              "urls": [
-                "https://github.com/pybind/pybind11/archive/v2.12.0.zip"
-              ]
-            }
-          }
-        },
-        "recordedRepoMappingEntries": [
-          [
-            "pybind11_bazel~",
-            "bazel_tools",
-            "bazel_tools"
-          ]
-        ]
-      }
-    },
     "@@rules_foreign_cc~//foreign_cc:extensions.bzl%tools": {
       "general": {
         "bzlTransitiveDigest": "a7qnESofmIRYId6wwGNPJ9kvExU80KrkxL281P3+lBE=",
@@ -1589,97 +1119,6 @@
         ]
       }
     },
-    "@@rules_fuzzing~//fuzzing/private:extensions.bzl%non_module_dependencies": {
-      "general": {
-        "bzlTransitiveDigest": "hVgJRQ3Er45/UUAgNn1Yp2Khcp/Y8WyafA2kXIYmQ5M=",
-        "usagesDigest": "YnIrdgwnf3iCLfChsltBdZ7yOJh706lpa2vww/i2pDI=",
-        "recordedFileInputs": {},
-        "recordedDirentsInputs": {},
-        "envVariables": {},
-        "generatedRepoSpecs": {
-          "platforms": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "urls": [
-                "https://mirror.bazel.build/github.com/bazelbuild/platforms/releases/download/0.0.8/platforms-0.0.8.tar.gz",
-                "https://github.com/bazelbuild/platforms/releases/download/0.0.8/platforms-0.0.8.tar.gz"
-              ],
-              "sha256": "8150406605389ececb6da07cbcb509d5637a3ab9a24bc69b1101531367d89d74"
-            }
-          },
-          "rules_python": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "sha256": "d70cd72a7a4880f0000a6346253414825c19cdd40a28289bdf67b8e6480edff8",
-              "strip_prefix": "rules_python-0.28.0",
-              "url": "https://github.com/bazelbuild/rules_python/releases/download/0.28.0/rules_python-0.28.0.tar.gz"
-            }
-          },
-          "bazel_skylib": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "sha256": "cd55a062e763b9349921f0f5db8c3933288dc8ba4f76dd9416aac68acee3cb94",
-              "urls": [
-                "https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.5.0/bazel-skylib-1.5.0.tar.gz",
-                "https://github.com/bazelbuild/bazel-skylib/releases/download/1.5.0/bazel-skylib-1.5.0.tar.gz"
-              ]
-            }
-          },
-          "com_google_absl": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "urls": [
-                "https://github.com/abseil/abseil-cpp/archive/refs/tags/20240116.1.zip"
-              ],
-              "strip_prefix": "abseil-cpp-20240116.1",
-              "integrity": "sha256-7capMWOvWyoYbUaHF/b+I2U6XLMaHmky8KugWvfXYuk="
-            }
-          },
-          "rules_fuzzing_oss_fuzz": {
-            "bzlFile": "@@rules_fuzzing~//fuzzing/private/oss_fuzz:repository.bzl",
-            "ruleClassName": "oss_fuzz_repository",
-            "attributes": {}
-          },
-          "honggfuzz": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_archive",
-            "attributes": {
-              "build_file": "@@rules_fuzzing~//:honggfuzz.BUILD",
-              "sha256": "6b18ba13bc1f36b7b950c72d80f19ea67fbadc0ac0bb297ec89ad91f2eaa423e",
-              "url": "https://github.com/google/honggfuzz/archive/2.5.zip",
-              "strip_prefix": "honggfuzz-2.5"
-            }
-          },
-          "rules_fuzzing_jazzer": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_jar",
-            "attributes": {
-              "sha256": "ee6feb569d88962d59cb59e8a31eb9d007c82683f3ebc64955fd5b96f277eec2",
-              "url": "https://repo1.maven.org/maven2/com/code-intelligence/jazzer/0.20.1/jazzer-0.20.1.jar"
-            }
-          },
-          "rules_fuzzing_jazzer_api": {
-            "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl",
-            "ruleClassName": "http_jar",
-            "attributes": {
-              "sha256": "f5a60242bc408f7fa20fccf10d6c5c5ea1fcb3c6f44642fec5af88373ae7aa1b",
-              "url": "https://repo1.maven.org/maven2/com/code-intelligence/jazzer-api/0.20.1/jazzer-api-0.20.1.jar"
-            }
-          }
-        },
-        "recordedRepoMappingEntries": [
-          [
-            "rules_fuzzing~",
-            "bazel_tools",
-            "bazel_tools"
-          ]
-        ]
-      }
-    },
     "@@rules_java~//java:rules_java_deps.bzl%compatibility_proxy": {
       "general": {
         "bzlTransitiveDigest": "KIX40nDfygEWbU+rq3nYpt3tVgTK/iO8PKh5VMBlN7M=",

ci/build_eagle_installer_win.sh

@@ -0,0 +1,28 @@
+#!/usr/bin/env bash
+
+/bin/mkdir -p win_output
+/usr/bin/dotnet publish src/main/csharp/net/eagle0/clients/win/installer/EagleInstaller.sln -o win_output
+SHA=`sha256sum /tmp/EagleInstaller.exe | awk '{print $1 }'`
+ZIP_FILE="updater__$SHA.zip"
+
+/usr/bin/zip win_output/$ZIP_FILE win_output/EagleInstaller.exe
+rm win_output/EagleInstaller.exe
+rm win_output/EagleInstaller.pdb
+
+DATE=`date +"%Y-%m-%d %T"`
+
+cat > win_output/updater.html <<-EOF
+<html>
+<head>
+<title>Download Eagle Updater</title>
+</head>
+<body>
+<a href="http://eagle0.net/assets/$ZIP_FILE">$ZIP_FILE</a> (updated $DATE)
+</body>
+</html>
+EOF
+
+SSH_KEY_FILE=$1
+SSH_USER_NAME=$2
+
+/usr/bin/rsync -r --copy-links -e "/usr/bin/ssh -i $SSH_KEY_FILE -p 9022" win_output/ $SSH_USER_NAME@eagle0.net:/www/assets/

ci/github_actions/build_ios_addressables.sh

@@ -1,32 +0,0 @@
-#!/usr/bin/env bash
-
-# Build iOS Addressables only (no player build)
-# This switches Unity to iOS target and builds addressables for CDN upload
-
-set -euxo pipefail
-
-. ./ci/unity_version.sh
-
-WORKSPACE=$(pwd)
-
-echo "Building protos"
-./scripts/build_protos.sh
-UNITY_INSTALL_PATH="/Applications/Unity/Hub/Editor"
-LOG_PATH=${1:-"/tmp/eagle0/editor_ios_addressables.log"}
-
-echo "Building iOS Addressables"
-
-mkdir -p "$(dirname "$LOG_PATH")"
-
-# Build Addressables for iOS target
-# Uses BuildiOSAddressables which explicitly switches build target
-${UNITY_INSTALL_PATH}/${UNITY_VERSION}/Unity.app/Contents/MacOS/Unity \
-   -nographics \
-   -batchmode \
-   -quit \
-   -executeMethod BuildScript.BuildiOSAddressables \
-   -logFile "$LOG_PATH" \
-   -projectPath "$WORKSPACE/src/main/csharp/net/eagle0/clients/unity/eagle0"
-
-echo "iOS Addressables build complete"
-echo "Bundles should be in: $WORKSPACE/src/main/csharp/net/eagle0/clients/unity/eagle0/ServerData/iOS/"

ci/github_actions/build_mac.sh

@@ -15,12 +15,10 @@ echo "Cleaning up $BUILD_DIR"
 /bin/rm -rf "$BUILD_DIR"
 /bin/mkdir -p "$BUILD_DIR"
 
-# Use custom build script that builds Addressables before the player
 ${UNITY_INSTALL_PATH}/${UNITY_VERSION}/Unity.app/Contents/MacOS/Unity \
    -nographics \
    -batchmode \
    -quit \
-   -executeMethod BuildScript.BuildMacPlayer \
-   -buildPath "$BUILD_DIR/eagle0.app" \
+   -buildOSXUniversalPlayer "$BUILD_DIR/eagle0.app" \
    -logFile "$LOG_PATH" \
    -projectPath "$WORKSPACE/src/main/csharp/net/eagle0/clients/unity/eagle0"

ci/github_actions/build_windows.sh

@@ -15,12 +15,10 @@ echo "Cleaning up $1"
 /bin/rm -rf $1
 /bin/mkdir -p $1
 
-# Use custom build script that builds Addressables before the player
 ${UNITY_INSTALL_PATH}/${UNITY_VERSION}/Unity.app/Contents/MacOS/Unity \
    -nographics \
    -batchmode \
    -quit \
-   -executeMethod BuildScript.BuildWindowsPlayer \
-   -buildPath "$BUILD_DIR/eagle0.exe" \
+   -buildWindows64Player $BUILD_DIR/eagle0.exe \
    -logFile $LOG_PATH \
    -projectPath "$WORKSPACE/src/main/csharp/net/eagle0/clients/unity/eagle0"

ci/github_actions/upload_addressables.sh

@@ -1,44 +0,0 @@
-#!/usr/bin/env bash
-
-# Upload Addressables bundles to DigitalOcean Spaces
-# Usage: ./upload_addressables.sh <build_target>
-# Example: ./upload_addressables.sh StandaloneOSX
-#
-# Required environment variables:
-#   ACCESS_KEY_ID - DigitalOcean Spaces access key (same as other deploys)
-#   SECRET_KEY    - DigitalOcean Spaces secret key (same as other deploys)
-
-set -euxo pipefail
-
-BUILD_TARGET=$1
-WORKSPACE=$(pwd)
-UNITY_PROJECT="$WORKSPACE/src/main/csharp/net/eagle0/clients/unity/eagle0"
-SERVER_DATA="$UNITY_PROJECT/ServerData/$BUILD_TARGET"
-
-# DigitalOcean Spaces configuration (same region as other eagle0 buckets)
-DO_ENDPOINT="https://sfo3.digitaloceanspaces.com"
-DO_BUCKET="eagle0-assets"
-
-if [ ! -d "$SERVER_DATA" ]; then
-    echo "No Addressables bundles found at $SERVER_DATA"
-    echo "Skipping upload (this is expected if Addressables are bundled locally)"
-    exit 0
-fi
-
-echo "Uploading Addressables bundles from $SERVER_DATA"
-echo "Target: s3://$DO_BUCKET/addressables/$BUILD_TARGET/"
-
-# Configure AWS CLI for DigitalOcean Spaces
-export AWS_ACCESS_KEY_ID="$ACCESS_KEY_ID"
-export AWS_SECRET_ACCESS_KEY="$SECRET_KEY"
-
-# Sync bundles to Spaces
-# --delete removes files in destination that don't exist in source
-# --acl public-read makes files publicly accessible
-aws s3 sync "$SERVER_DATA" "s3://$DO_BUCKET/addressables/$BUILD_TARGET/" \
-    --endpoint-url "$DO_ENDPOINT" \
-    --acl public-read \
-    --delete
-
-echo "Addressables upload complete"
-echo "Files available at: https://assets.eagle0.net/addressables/$BUILD_TARGET/"

deploy/env.template

@@ -0,0 +1,40 @@
+# Environment template for production deployment
+# This file defines all env vars used by docker-compose.prod.yml
+# Workflows should update their specific vars without overwriting others
+
+# Container images (managed by respective build workflows)
+# Note: Shardok runs on Hetzner, deployed via shardok_arm64_build.yml
+EAGLE_IMAGE=registry.digitalocean.com/eagle0/eagle-server:latest
+ADMIN_IMAGE=registry.digitalocean.com/eagle0/admin-server:latest
+JFR_SIDECAR_IMAGE=registry.digitalocean.com/eagle0/jfr-sidecar:latest
+AUTH_IMAGE=registry.digitalocean.com/eagle0/auth-server:latest
+
+# OpenAI / LLM
+OPENAI_API_KEY=
+GPT_MODEL_NAME=gpt-4o
+
+# DigitalOcean Spaces (S3-compatible storage)
+EAGLE_ENABLE_S3=false
+DO_SPACES_ACCESS_KEY=
+DO_SPACES_SECRET_KEY=
+
+# JWT authentication
+JWT_PRIVATE_KEY=
+
+# OAuth providers
+DISCORD_CLIENT_ID=
+DISCORD_CLIENT_SECRET=
+GOOGLE_CLIENT_ID=
+GOOGLE_CLIENT_SECRET=
+
+# Shardok connection (Hetzner ARM64 server)
+SHARDOK_ADDRESS=
+SHARDOK_AUTH_TOKEN=
+
+# Monitoring
+SENTRY_DSN=
+
+# Email (Fastmail JMAP)
+FASTMAIL_API_TOKEN=
+FASTMAIL_FROM_EMAIL=
+FASTMAIL_FROM_NAME=

deploy/update-env.sh

@@ -0,0 +1,65 @@
+#!/bin/bash
+# Update .env file without losing other variables
+# Usage: ./update-env.sh KEY1=value1 KEY2=value2 ...
+#
+# This script:
+# 1. Creates .env from template if it doesn't exist
+# 2. Updates only the specified KEY=value pairs
+# 3. Preserves all other existing values
+
+set -e
+
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+ENV_FILE="${ENV_FILE:-/opt/eagle0/.env}"
+TEMPLATE_FILE="${TEMPLATE_FILE:-$SCRIPT_DIR/env.template}"
+
+# Create .env from template if it doesn't exist
+if [ ! -f "$ENV_FILE" ]; then
+    if [ -f "$TEMPLATE_FILE" ]; then
+        echo "Creating .env from template..."
+        grep -v '^#' "$TEMPLATE_FILE" | grep -v '^$' > "$ENV_FILE"
+    else
+        echo "Creating empty .env..."
+        touch "$ENV_FILE"
+    fi
+    chmod 600 "$ENV_FILE"
+fi
+
+# Process each KEY=VALUE argument
+for arg in "$@"; do
+    # Skip empty args
+    [ -z "$arg" ] && continue
+
+    # Parse KEY=VALUE
+    KEY="${arg%%=*}"
+    VALUE="${arg#*=}"
+
+    # Skip if no key
+    [ -z "$KEY" ] && continue
+
+    # Skip setting empty values (keeps existing value)
+    if [ -z "$VALUE" ]; then
+        echo "Skipping $KEY (empty value)"
+        continue
+    fi
+
+    # Remove existing line for this key and add new one
+    # Use single quotes to avoid issues with special characters in values
+    # (JSON strings, base64 with /, etc.)
+    # Escape any single quotes in the value by replacing ' with '\''
+    ESCAPED_VALUE="${VALUE//\'/\'\\\'\'}"
+
+    if grep -q "^${KEY}=" "$ENV_FILE" 2>/dev/null; then
+        # Key exists, remove old line and add new one (sed with special chars is fragile)
+        grep -v "^${KEY}=" "$ENV_FILE" > "$ENV_FILE.tmp" && mv "$ENV_FILE.tmp" "$ENV_FILE"
+        echo "${KEY}='${ESCAPED_VALUE}'" >> "$ENV_FILE"
+        echo "Updated $KEY"
+    else
+        # Key doesn't exist, add it
+        echo "${KEY}='${ESCAPED_VALUE}'" >> "$ENV_FILE"
+        echo "Added $KEY"
+    fi
+done
+
+chmod 600 "$ENV_FILE"
+echo "Done updating $ENV_FILE"

docker-compose.prod.yml

@@ -18,22 +18,23 @@ services:
     image: ${EAGLE_IMAGE:-registry.digitalocean.com/eagle0/eagle-server:latest}
     container_name: eagle-blue
     command:
+      - "--gpt-model-name"
+      - "${GPT_MODEL_NAME:-gpt-5.1}"
       - "--shardok-interface-remote-address"
-      - "${SHARDOK_ADDRESS}"
+      - "${SHARDOK_ADDRESS:-shardok:40042}"
       - "--auth-service-url"
       - "auth:40033"
     ports:
       - "40032:40032"
     environment:
       OPENAI_API_KEY: "${OPENAI_API_KEY:-}"
-      ANTHROPIC_API_KEY: "${ANTHROPIC_API_KEY:-}"
-      GEMINI_API_KEY: "${GEMINI_API_KEY:-}"
       EAGLE_ENABLE_S3: "${EAGLE_ENABLE_S3:-false}"
       DO_SPACES_ENDPOINT: "${DO_SPACES_ENDPOINT:-https://sfo3.digitaloceanspaces.com}"
       DO_SPACES_ACCESS_KEY: "${DO_SPACES_ACCESS_KEY:-}"
       DO_SPACES_SECRET_KEY: "${DO_SPACES_SECRET_KEY:-}"
-      # JWT public key for token validation (auth service handles signing)
-      # Reads from /etc/eagle0/keys/public.pem via shared volume
+      JWT_PRIVATE_KEY: "${JWT_PRIVATE_KEY:-}"
+      DISCORD_CLIENT_ID: "${DISCORD_CLIENT_ID:-}"
+      DISCORD_CLIENT_SECRET: "${DISCORD_CLIENT_SECRET:-}"
       # Auth token for Shardok on Hetzner (required)
       SHARDOK_AUTH_TOKEN: "${SHARDOK_AUTH_TOKEN:-}"
       # Use persistent volume for save data (users, games, etc.)
@@ -46,7 +47,7 @@ services:
       - ./archived:/app/archived     # Archived completed games
       - ./jfr:/app/jfr  # JFR recordings - dump with: docker exec eagle-blue jcmd 1 JFR.dump filename=/app/jfr/profile.jfr
       - jvm-tmp:/tmp  # Shared with jfr-sidecar for JVM attach socket files
-      - jwt-keys:/etc/eagle0/keys:ro  # JWT public key from auth service (read-only)
+      - jwt-keys:/etc/eagle0/keys  # Shared JWT keys with auth service
     depends_on:
       - auth
     restart: unless-stopped
@@ -67,22 +68,23 @@ services:
     container_name: eagle-green
     profiles: ["blue-green"]  # Only started during blue-green deployment
     command:
+      - "--gpt-model-name"
+      - "${GPT_MODEL_NAME:-gpt-5.1}"
       - "--shardok-interface-remote-address"
-      - "${SHARDOK_ADDRESS}"
+      - "${SHARDOK_ADDRESS:-shardok:40042}"
       - "--auth-service-url"
       - "auth:40033"
     ports:
       - "40034:40032"  # Different host port for staging
     environment:
       OPENAI_API_KEY: "${OPENAI_API_KEY:-}"
-      ANTHROPIC_API_KEY: "${ANTHROPIC_API_KEY:-}"
-      GEMINI_API_KEY: "${GEMINI_API_KEY:-}"
       EAGLE_ENABLE_S3: "${EAGLE_ENABLE_S3:-false}"
       DO_SPACES_ENDPOINT: "${DO_SPACES_ENDPOINT:-https://sfo3.digitaloceanspaces.com}"
       DO_SPACES_ACCESS_KEY: "${DO_SPACES_ACCESS_KEY:-}"
       DO_SPACES_SECRET_KEY: "${DO_SPACES_SECRET_KEY:-}"
-      # JWT public key for token validation (auth service handles signing)
-      # Reads from /etc/eagle0/keys/public.pem via shared volume
+      JWT_PRIVATE_KEY: "${JWT_PRIVATE_KEY:-}"
+      DISCORD_CLIENT_ID: "${DISCORD_CLIENT_ID:-}"
+      DISCORD_CLIENT_SECRET: "${DISCORD_CLIENT_SECRET:-}"
       SHARDOK_AUTH_TOKEN: "${SHARDOK_AUTH_TOKEN:-}"
       EAGLE_SAVE_DIR: "/app/saves"
       EAGLE_ARCHIVE_DIR: "/app/archived"
@@ -93,7 +95,7 @@ services:
       - ./archived:/app/archived     # Same archive directory as blue
       - ./jfr:/app/jfr               # JFR recordings (same as blue)
       - jvm-tmp:/tmp                 # Shared with jfr-sidecar-green for JVM attach socket files
-      - jwt-keys:/etc/eagle0/keys:ro # JWT public key from auth service (read-only)
+      - jwt-keys:/etc/eagle0/keys    # Shared JWT keys with auth service
     depends_on:
       - auth
     restart: "no"  # Don't auto-restart during deployment
@@ -138,9 +140,6 @@ services:
       APPLE_TEAM_ID: "${APPLE_TEAM_ID:-}"
       APPLE_SIGNIN_KEY_ID: "${APPLE_SIGNIN_KEY_ID:-}"
       APPLE_SIGNIN_PRIVATE_KEY: "${APPLE_SIGNIN_PRIVATE_KEY:-}"
-      # Twitch OAuth credentials
-      TWITCH_CLIENT_ID: "${TWITCH_CLIENT_ID:-}"
-      TWITCH_CLIENT_SECRET: "${TWITCH_CLIENT_SECRET:-}"
       # Server base URL for OAuth callbacks
       SERVER_BASE_URL: "${SERVER_BASE_URL:-https://prod.eagle0.net}"
       # JWT keys - PEM files in volume, bootstrapped from JWK on first run

docs/ASSET_AUDIT.md

@@ -109,37 +109,11 @@ All 26 tracks have CC licenses with proper attribution:
 | Dragon Castle | Makai Symphony | CC BY-SA 3.0 |
 | Durandal | Makai Symphony | CC BY-SA 3.0 |
 
-**Tracks with non-CC licenses:**
-
-| Track | Artist | License | Source |
-|-------|--------|---------|--------|
-| Market Day | RandomMind | Free without attribution | [Chosic](https://www.chosic.com/download-audio/27016/) |
-| Shopping List | Komiku | Free without attribution | [Chosic](https://www.chosic.com/download-audio/24714/) |
-| Medieval: Victory Theme | RandomMind | CC0 Public Domain | [Chosic](https://www.chosic.com/download-audio/28492/) |
-| No Time for Greatness | Dima Koltsov | CC BY 4.0 | [YouTube](https://www.youtube.com/watch?v=cQh0OWIFdgM) |
-| Warriors of Demacia | Dima Koltsov | CC BY 4.0 | [YouTube](https://www.youtube.com/watch?v=yktSUMJn9ao) |
-| Forest Queen Tale | Dima Koltsov | Presumed CC BY 4.0 | Not found on YouTube; other Dima Koltsov tracks are CC BY 4.0 |
-| Valor | Dima Koltsov | CC BY 4.0 | [YouTube](https://www.youtube.com/watch?v=uoHYJRPcS2Y) |
-| Clouds | Dima Koltsov | Presumed CC BY 4.0 | Not found on YouTube; other Dima Koltsov tracks are CC BY 4.0 |
-
-**Note on Dima Koltsov tracks:** 3 of 5 tracks confirmed CC BY 4.0 via YouTube. 2 remaining tracks (Forest Queen Tale, Clouds) presumed same license but not verified.
-
----
-
-## 2b. Creative Commons Sound Effects
-
-**Location:** `Assets/Shardok/Sounds/`
-
-| File | Description | Artist | License | Source |
-|------|-------------|--------|---------|--------|
-| `rain_loop.ogg` | Rain falling on clay roof tiles (loopable) | aesqe | CC BY 4.0 | [Freesound #37618](https://freesound.org/people/aesqe/sounds/37618/) |
-| `blizzard_wind_loop.wav` | Wind draft loop (indoor recording, loops seamlessly) | nsstudios | CC BY 4.0 | [Freesound #651540](https://freesound.org/people/nsstudios/sounds/651540/) |
-
-**Location:** `Assets/Shardok/soundEffects/`
-
-| File | Description | Artist | License | Source |
-|------|-------------|--------|---------|--------|
-| `runaway.mp3` | Medieval army running loop (gravel + metal/chain) | Yap_Audio_Production | CC BY 4.0 | [Freesound #218997](https://freesound.org/people/Yap_Audio_Production/sounds/218997/) |
+**Tracks without specific license (verify):**
+- Market Day
+- Shopping List
+- Medieval: Victory Theme
+- Tracks by Dima Koltsov (AUDIUS): No Time for Greatness, Warriors of Demacia, Forest Queen Tale, Valor, Clouds
 
 ---
 
@@ -155,61 +129,42 @@ All 26 tracks have CC licenses with proper attribution:
 
 ## 4. Potentially Problematic Assets (Review Needed)
 
-### ~~Clip Art (Unknown License)~~ RESOLVED
-| File | Status |
-|------|--------|
-| ~~`Assets/Shardok/commandImages/bridge.png`~~ | **REPLACED** (2026-01-23) with AI-generated wooden rope bridge icon (ChatGPT/DALL-E 3, 512x512 PNG). No licensing restrictions - AI-generated for this project. |
-| ~~`Assets/Images/startFire.png`~~ | **REPLACED** (2026-01-23) with "Flame Icon" from [UXWing](https://uxwing.com/flame-icon/) (free for commercial use, no attribution required). Consolidated duplicate removed. |
-| ~~`Assets/Shardok/commandImages/startFire.png`~~ | **DELETED** (2026-01-23) - duplicate removed, all references updated to use `Assets/Images/startFire.png` |
+### Stock Images (Possible License Issues)
+These appear to be stock images that may have been used as placeholders:
+
+| File | Concern |
+|------|---------|
+| ~~`Assets/Eagle/79066358-stock-illustration-raster-illustration-medieval-purse-bag...jpg`~~ | **DELETED** (2025-01-04) |
+| ~~`Assets/Images/kisspng-hammer-hand-saws-tool-clip-art...jpg`~~ | **DELETED** (2025-01-04) |
+| ~~`Assets/Images/lee-ermy-cropped.jpg`~~ | **DELETED** (2025-01-04) |
+| ~~`Assets/Eagle/images.jpeg`~~ | **DELETED** (2025-01-04) |
+
+### Clip Art (Unknown License)
+| File | Concern |
+|------|---------|
+| `Assets/Shardok/commandImages/bridge.png` | Clip art style wooden bridge, unknown source - **needs replacement** |
+| `Assets/Images/startFire.png` | Icon, unknown source - **needs verification or replacement** |
 
 ### Shardok Sound Effects
 - **Location:** `Assets/Shardok/soundEffects/`
-- **Count:** 37 audio files (was incorrectly counted as 56 including .meta files)
+- **Count:** 56 MP3 files
 - **Contents:** Spell effects, movement, combat sounds
+- **Status:** Unknown origin - may be custom or need verification
 
-**Verified from [Zombie Monster - Undead Collection](https://assetstore.unity.com/packages/audio/sound-fx/creatures/zombie-monster-undead-collection-70662) (Unity Asset Store):**
-- `raise_undead.mp3`
-- `undead_break_control.mp3`
-- `undead_grew.wav`
+### Free Icons
+- **Location:** `Assets/free_icons/`
+- **Count:** 8 PNG weather icons
+- **Status:** Verify "free" means commercially usable
 
-**⚠️ MUST REPLACE (1 remaining):**
-- ~~`anybody.mp3`~~ - **REPLACED** (2026-01-23) with `Positive Effect 6.wav` from Magic Spells Sound Effects LITE
-- ~~`burnination.mp3`~~ - **REPLACED** (2026-01-23) with `Magic Element Fire 04.wav` from Medieval Combat Sounds
-- `failure_horn.mp3` - licensing issue, no replacement found in purchased assets
-- ~~`runaway.mp3`~~ - **REPLACED** (2026-01-27) with `MedievalArmyRunningLoop.mp3` from Freesound (CC BY 4.0)
-
-**Presumed from Unity Asset Store purchases (31 files):**
-Owner believes these are from: Fantasy Interface Sounds, Medieval Combat Sounds, Magic Spells Sound Effects LITE, and/or Medieval Battle Sound Pack.
-- `archery.mp3`, `battle_shout.mp3`, `boo.mp3`, `braved_water.mp3`
-- `build_bridge.mp3`, `build_bridge_failure.mp3`, `charge.mp3`
-- `dismiss_unit.mp3`, `duel_challenged.mp3`, `failure_horn.mp3`, `fear.mp3`, `fear_failed.mp3`
-- `fire_extinguish.mp3`, `fire_spread.mp3`, `fire_start.mp3`, `fire_start_failure.mp3`
-- `freeze.mp3`, `holy_wave.mp3`, `holy_wave_damage.mp3`, `jail_door.mp3`, `lightning.mp3`
-- `melee.mp3`, `meteor.mp3`, `mind_control.mp3`, `move.mp3`, `move 1.mp3`
-- `raging_fire.mp3`, `reduce.mp3`, `repair.mp3`, `repair_failed.mp3`, `splash.mp3`
-
-### ~~Free Icons~~ RESOLVED
-- **Location:** `Assets/free_icons/` - **DELETED** (2026-01-27)
-- **Resolution:** All icons replaced with equivalents from purchased Asset Store packs:
-  - `blizzard.png` → `16_blizzard_nobg.png` (4000_Fantasy_Icons)
-  - `rain.png` → `12_Magic_rain_nobg.png` (4000_Fantasy_Icons)
-  - `thunderstorm.png` → `27_Storm_nobg.png` (4000_Fantasy_Icons)
-  - `wind.png` → `23_Light_blow_nobg.png` (4000_Fantasy_Icons)
-  - `thermometer.png` → `startFire.png` (existing licensed asset)
-  - `snow.png` → `16_blizzard_nobg.png` (4000_Fantasy_Icons)
-  - `cloud.png`, `sun.png` → deleted (unused)
-
-### ~~Terrain Hexes~~ VERIFIED
+### Terrain Hexes
 - **Location:** `Assets/Terrain Hexes/`
 - **Count:** 85 PNG files
-- **Status:** ✓ Confirmed Unity Asset Store purchase (2026-01-23)
+- **Status:** Unknown source - verify licensing
 
-### ~~StrategyGameIcons~~ VERIFIED
+### StrategyGameIcons
 - **Location:** `Assets/StrategyGameIcons/`
 - **Count:** 138 PNG files
-- **Publisher:** REXARD
-- **Asset Store Link:** https://assetstore.unity.com/packages/2d/gui/icons/strategy-game-icons-64816
-- **Status:** ✓ Confirmed Unity Asset Store purchase (2026-01-23)
+- **Status:** Unknown source - verify licensing
 
 ---
 
@@ -239,31 +194,28 @@ NuGet packages in `Assets/Packages/` all include LICENSE.TXT files:
 
 ## Action Items
 
-### Must Replace Before Opening Public Access:
+### Must Verify Before Opening Public Access:
 
-1. ~~**Clip art images**~~ - **RESOLVED** (2026-01-23): Replaced with properly licensed alternatives
+1. ~~**Stock images** - The JPG files with stock image filenames need review.~~ **DONE** - Deleted lee-ermy, kisspng, stock-illustration, Yosemite Sam, and images.jpeg (2025-01-04)
 
-2. **Shardok sound effects** - 1 file remaining:
-   - ~~`anybody.mp3`~~ - **REPLACED** (2026-01-23)
-   - ~~`burnination.mp3`~~ - **REPLACED** (2026-01-23)
-   - `failure_horn.mp3` - licensing issue, needs replacement
-   - ~~`runaway.mp3`~~ - **REPLACED** (2026-01-27) with Freesound CC BY 4.0
+2. **Clip art images** - Unknown license, need replacement with properly licensed alternatives:
+   - `Assets/Shardok/commandImages/bridge.png` - wooden bridge icon
+   - `Assets/Images/startFire.png` - fire icon
 
-### Low Priority (Verify):
+3. **Shardok sound effects** - 56 MP3 files of unknown origin. Either:
+   - Document their source
+   - Replace with known-licensed alternatives
+   - Confirm they were custom-created
 
-3. **Dima Koltsov tracks** - 2 of 5 not verified: `Forest Queen Tale`, `Clouds` (presumed CC BY 4.0 like his other tracks)
+4. **Terrain Hexes** - 85 hex tiles of unknown source
+   - **TODO:** Confirm if this is a Unity Asset Store purchase (owner believes it is)
 
-### Already Resolved:
+5. **StrategyGameIcons** - 138 icons of unknown source
+   - **TODO:** Investigate origin - check Unity Asset Store purchase history
 
-4. ~~**Free Icons**~~ - **RESOLVED** (2026-01-27): All replaced with Asset Store equivalents, folder deleted
+6. **AUDIUS music tracks** - Verify Dima Koltsov tracks are licensed for commercial use
 
-5. ~~**Terrain Hexes**~~ - **VERIFIED** (2026-01-23): Confirmed Unity Asset Store purchase
-
-6. ~~**StrategyGameIcons**~~ - **VERIFIED** (2026-01-23): Unity Asset Store purchase (REXARD)
-
-7. ~~**Medieval: Victory Theme**~~ - **VERIFIED** (2026-01-23): CC0 Public Domain by RandomMind ([Chosic](https://www.chosic.com/download-audio/28492/))
-
-8. ~~**Discord logo**~~ - **OK** (2026-01-23): Usage complies with Discord brand guidelines for "Login with Discord" button
+7. **Discord logo** (`Eagle/Discord-Logo-Blurple.png`) - Likely fine for "Login with Discord" button per Discord brand guidelines, but verify usage complies with their terms
 
 ### Already Safe:
 
@@ -277,23 +229,12 @@ NuGet packages in `Assets/Packages/` all include LICENSE.TXT files:
 
 ## Recommendation
 
-**Remaining before public release:**
+Before removing HTTP basic auth:
 
-1. Replace 1 sound effect with licensing issue:
-   - `failure_horn.mp3`
-
-**Low priority:**
-
-2. Verify 2 Dima Koltsov tracks (`Forest Queen Tale`, `Clouds`) - presumed CC BY 4.0
-
-**Already resolved:**
-
-- ~~Clip art images~~ **DONE** - replaced with properly licensed alternatives
-- ~~Terrain Hexes~~ **DONE** - confirmed Asset Store purchase
-- ~~StrategyGameIcons~~ **DONE** - Unity Asset Store (REXARD)
-- ~~Medieval: Victory Theme~~ **DONE** - CC0 Public Domain
-- ~~3 other Dima Koltsov tracks~~ **DONE** - confirmed CC BY 4.0
-- ~~anybody.mp3, burnination.mp3~~ **DONE** - replaced
-- ~~free_icons~~ **DONE** - replaced with Asset Store equivalents
+1. ~~Delete or replace the 4 suspicious JPG/JPEG files in `Assets/Eagle/` and `Assets/Images/`~~ **DONE** (2025-01-04)
+2. Replace clip art images (`bridge.png`, `startFire.png`) with properly licensed alternatives (e.g., from [game-icons.net](https://game-icons.net) CC BY 3.0)
+3. Verify source of `Assets/Shardok/soundEffects/` MP3s
+4. Verify source of `Assets/Terrain Hexes/` and `Assets/StrategyGameIcons/`
+5. If any are from early development with unclear licensing, replace them
 
 The bulk of your assets (95%+) are properly licensed Asset Store purchases or CC content.

docs/DEPROTO_PLAN.md

@@ -0,0 +1,285 @@
+# Deproto Migration Plan
+
+## Vision
+
+**Protocol buffers should only be used at the edges** — for network serialization (gRPC) and disk persistence. Inside the Eagle game engine, all logic should operate on native Scala models.
+
+```
+┌─────────────────────────────────────────────────────────────────────┐
+│                         GRPC BOUNDARY                               │
+│  EagleServiceImpl.scala  ←→  Proto Messages  ←→  Unity Client       │
+└─────────────────────────────────────────────────────────────────────┘
+                                   ↓
+                          GameStateConverter
+                                   ↓
+┌─────────────────────────────────────────────────────────────────────┐
+│                         SCALA ENGINE                                │
+│                                                                     │
+│   GameStateC ───→ Actions ───→ ActionResultT ───→ New GameStateC   │
+│       ↑                                                   │        │
+│       │               (Pure Scala models)                 │        │
+│       └───────────────────────────────────────────────────┘        │
+│                                                                     │
+│   HeroC, FactionC, ProvinceC, BattalionC, ArmyC, etc.              │
+└─────────────────────────────────────────────────────────────────────┘
+                                   ↓
+                          GameStateConverter
+                                   ↓
+┌─────────────────────────────────────────────────────────────────────┐
+│                      PERSISTENCE BOUNDARY                           │
+│  GameHistory.scala  ←→  Proto Messages  ←→  File/Database          │
+└─────────────────────────────────────────────────────────────────────┘
+```
+
+---
+
+## Current State (January 2026)
+
+### Summary
+
+| Area | Proto Imports | Status |
+|------|---------------|--------|
+| AI (`/ai/`) | **0** | ✅ **Complete** |
+| Actions (`/library/actions/impl/action/`) | **0** | ✅ **Complete** |
+| Commands (`/library/actions/impl/command/`) | **0** | ✅ **Complete** |
+| Availability (`/library/actions/availability/`) | **0** | ✅ **Complete** |
+| Command Choice Helpers (`/library/util/command_choice_helpers/`) | **0** | ✅ **Complete** |
+| View Filters (`/library/util/view_filters/`) | **0** | ✅ **Complete** (except boundary code) |
+| LLM Prompt Generators (`/library/actions/llm_prompt_generators/`) | **56** | ⏳ Remaining work (34 files) |
+| Other Utilities (`/library/util/`) | **7** | ⏳ Remaining work (2 files) |
+| Root Library (`/library/`) | **8** | Boundary code (3 files) |
+
+**Total: ~65 proto imports remaining** (down from 149)
+
+### Completed Phases
+
+| Phase | Status | Summary |
+|-------|--------|---------|
+| Phase 1: GameStateC | **Complete** | Scala `GameState` model with 22 fields |
+| Phase 2: EngineImpl | **Complete** | Holds Scala `GameState` internally |
+| Phase 3: GameHistory | **Complete** | `stateAfter` returns Scala GameState |
+| Phase 4: ActionResultT | **Complete** | All 59 actions return `ActionResultT` |
+| Phase 5: Action Base Classes | **Complete** | All actions converted to T-type base classes |
+| Phase 5b-d: RoundPhaseAdvancer | **Complete** | Uses Scala GameState throughout |
+| Phase 6: Core Engine | **Complete** | ActionResultApplier, RandomStateSequencer protoless |
+| Phase 6b: CommandFactory | **Complete** | Uses Scala SelectedCommand and AvailableCommand |
+| Phase 6c: AI Clients | **Complete** | AIClient, command choosers all protoless |
+| Phase 6d: CommandSelection | **Complete** | Renamed ScalaCommandSelection → CommandSelection |
+
+### Recent Completions (PRs #5326, #5330, #5332, #5333, #5334, #5336, #5341, #5342)
+
+1. **CommandFactory protoless** - Now accepts/returns Scala `SelectedCommand` types
+2. **AI clients protoless** - `AIClient`, `MidGameAIClient`, all command choosers use Scala types
+3. **CommandSelection cleanup** - Deleted legacy proto-based `CommandSelection`, renamed `ScalaCommandSelection` → `CommandSelection`
+4. **AvailableCommandsFactory protoless** - Returns Scala `OneProvinceAvailableCommands`
+5. **All CommandChoiceHelpers protoless** - All selector/chooser files converted
+6. **ChronicleEventGenerator protoless** (PR #5332) - Removed last proto enum import from Actions layer
+7. **ProvinceUtils protoless** (PR #5333) - Converted to use Scala `BattalionType`
+8. **FactionViewFilter protoless** (PR #5334) - Returns Scala `FactionView`, converts to proto at edge
+9. **HeroViewFilter protoless** (PR #5336) - Returns Scala `HeroView`, converts to proto at edge
+10. **ProvinceViewFilter protoless** (PR #5341) - `ProvinceView.knownEvents` uses Scala `ProvinceEvent`, converts at edge
+11. **StatWithConditionUtils & ProvinceEventUtils protoless** (PR #5342) - Deleted unused proto overloads
+12. **IncomingArmyUtils protoless** (PR #5348) - Deleted unused `stats()` method
+13. **RansomOfferHelpers deleted** (PR #5351) - Deleted unused dead code file
+
+---
+
+## Remaining Work
+
+### Phase 7: View Filters ✅ Complete
+
+| File | Status | Migration Path |
+|------|--------|----------------|
+| `FactionViewFilter.scala` | ✅ **Complete** | Returns Scala `FactionView` (PR #5334) |
+| `HeroViewFilter.scala` | ✅ **Complete** | Returns Scala `HeroView` (PR #5336) |
+| `ProvinceViewFilter.scala` | ✅ **Complete** | Returns Scala `ProvinceView` with Scala events (PR #5341) |
+| `GameStateViewFilter.scala` | ✅ **Complete** | Returns Scala `GameStateView`, converted at boundary |
+| `GameStateViewDiffer.scala` | ✅ **Complete** | Uses Scala diff types internally, converted at boundary |
+| `BattleFilter.scala` | Keep | Uses `ShardokBattleView` (boundary code for battles) |
+
+**Pattern established**: Create Scala view type → Create converter → Update filter to return Scala type → Convert at edge.
+
+### Phase 8: LLM Prompt Generators (~56 proto imports in 34 files)
+
+The LLM prompt generators still use proto types for hero/faction/province data:
+
+| File Category | Files | Proto Usage |
+|---------------|-------|-------------|
+| Diplomacy prompts | 12 | `Hero`, `Faction`, `Province` protos |
+| Quest prompts | 4 | `Hero`, `Faction` protos |
+| Chronicle prompts | 3 | `Hero`, `Faction`, `Province` protos |
+| Other prompts | 15 | Various proto types |
+
+**Migration strategy**: These files generate text for LLM prompts. They can be migrated to accept Scala types (`HeroT`, `FactionT`, `ProvinceT`) with converters at the call sites if needed.
+
+**Priority**: Medium - These don't block other migrations and are isolated.
+
+### Phase 9: Remaining Utilities (~1 proto import in 1 file)
+
+| File | Proto Usage | Migration Path |
+|------|-------------|----------------|
+| `ProvinceEventUtils.scala` | ✅ **0** | Deleted unused proto overloads (PR #5342) |
+| `StatWithConditionUtils.scala` | ✅ **0** | Deleted unused proto overloads (PR #5342) |
+| `MapGenerator.scala` | 1 import | Convert to Scala types |
+| `IncomingArmyUtils.scala` | ✅ **0** | Deleted unused `stats()` method (PR #5348) |
+| `GameStateViewDiffer.scala` | ✅ **0** | Uses Scala diff types, converts at boundary |
+
+### Phase 10: History APIs 🔄 In Progress
+
+**Completed:**
+- `ActionWithResultingState` now has `scalaActionResult` property (lazy converted from proto)
+- `ActionResultFilter.includeForPlayer` uses Scala types (`ActionResultT`, `NotificationT`, `ActionResultType`)
+- `GameHistory.withNewResultsScala` preserves both Scala `GameState` and `ActionResultT` to avoid re-conversion
+
+**Remaining:**
+```
+src/main/scala/net/eagle0/eagle/service/InMemoryHistory.scala
+src/main/scala/net/eagle0/eagle/service/PersistedHistory.scala
+```
+Change APIs to vend Scala `GameState` and `ActionResultT` instead of proto versions.
+
+---
+
+## Architecture Summary
+
+### Fully Protoless Areas ✅
+
+- **AI layer** (`/ai/`) - All AI clients and command choosers
+- **Actions** (`/library/actions/impl/action/`) - All 52 action files
+- **Commands** (`/library/actions/impl/command/`) - CommandFactory and all commands
+- **Availability** (`/library/actions/availability/`) - AvailableCommandsFactory and all factories
+- **Command helpers** (`/library/util/command_choice_helpers/`) - All selectors and choosers
+- **Core types** - `CommandSelection`, `SelectedCommand`, `AvailableCommand`, `OneProvinceAvailableCommands`
+- **View types** - `FactionView`, `HeroView`, `ProvinceView` (return Scala, convert at edge)
+
+### Proto at Boundaries (Expected) ✅
+
+- `EagleServiceImpl.scala` - gRPC boundary
+- `GameController.scala` - Client communication
+- `GameStateViewFilter.scala` - Converts Scala views to proto for client
+- `*Converter.scala` - Explicit conversion utilities
+- `PersistedHistory.scala` - Disk persistence
+
+### Remaining Proto Usage ⏳
+
+- LLM prompt generators (56 imports in 34 files) - Medium priority
+- MapGenerator (1 import) - Low priority
+- BattleFilter (1 import) - Keep (boundary)
+- History API internals - Low priority
+
+---
+
+## Estimated Remaining Effort
+
+| Component | Files | Imports | Priority |
+|-----------|-------|---------|----------|
+| View Filters | 0 | 0 | ✅ Complete |
+| LLM Prompt Generators | 34 | 56 | Medium |
+| Utility files | 1 | 1 | Low |
+| Root Library (boundary) | 3 | 8 | Keep |
+| **Total** | **37** | **~65** | |
+
+---
+
+## Success Criteria
+
+### Code Quality
+- [x] Zero proto imports in `/ai/`
+- [x] Zero proto imports in `/library/actions/impl/command/`
+- [x] Zero proto imports in `/library/actions/availability/`
+- [x] Zero proto imports in `/library/util/command_choice_helpers/`
+- [x] Zero proto imports in `/library/actions/impl/action/`
+- [x] Zero proto imports in `/library/util/view_filters/` (except BattleFilter boundary code)
+- [ ] Zero proto imports in `/library/actions/llm_prompt_generators/`
+- [ ] Zero proto imports in `/library/util/` (except view filters)
+
+### Architecture
+- [x] Clear separation: Scala models (internal) vs Proto (boundaries)
+- [x] Converters as the only bridge between domains
+- [x] CommandFactory accepts/returns Scala types
+- [x] AI layer fully protoless
+- [x] FactionViewFilter returns Scala types
+- [x] HeroViewFilter returns Scala types
+- [x] ProvinceViewFilter returns Scala types
+- [x] All view filters return Scala types
+- [ ] LLM layer uses Scala types
+- [ ] No "proto creep" into business logic
+
+---
+
+## Open Questions
+
+1. **LLM Prompt Generators**: Should these accept Scala types directly, or is it acceptable to have proto usage here since they're generating text (not core game logic)?
+
+2. ~~**GameStateViewDiffer**: This works with view protos for client updates. Should it remain proto-based since it's generating client-facing data?~~ **Resolved**: GameStateViewDiffer now uses Scala types internally (`GameStateViewDiff`, `ProvinceViewDiff`, etc.) and converts to proto at the boundary in `ActionResultFilter`.
+
+3. **History Serialization**: Keep proto for persistence (good for schema evolution) or consider alternatives?
+
+---
+
+## Proto Import Inventory (Detailed)
+
+**Current: ~65 proto imports across 37 files** (as of 2026-01-14)
+
+### Summary by Directory
+
+| Directory | Files | Imports | Status |
+|-----------|-------|---------|--------|
+| `ai/` | 0 | 0 | ✅ Clean |
+| `actions/availability/` | 0 | 0 | ✅ Clean |
+| `actions/impl/action/` | 0 | 0 | ✅ Clean |
+| `actions/impl/command/` | 0 | 0 | ✅ Clean |
+| `actions/llm_prompt_generators/` | 34 | 56 | LLM request types |
+| `util/command_choice_helpers/` | 0 | 0 | ✅ Clean |
+| `util/view_filters/` | 1 | 1 | ✅ Clean (except boundary) |
+| `util/` (other) | 1 | 1 | ✅ Clean |
+| Root (`library/`) | 3 | 9 | Boundary code |
+
+### util/view_filters/ (0 imports, except boundary)
+
+| File | Import | Notes |
+|------|--------|-------|
+| `GameStateViewFilter.scala` | ✅ **0** | Returns Scala `GameStateView`, converts at edge |
+| `GameStateViewDiffer.scala` | ✅ **0** | Uses Scala diff types, converts at edge |
+| `BattleFilter.scala` | 1 | Battle view boundary (keep proto) |
+
+### util/ other files (1 import, 1 file)
+
+| File | Imports | Notes |
+|------|---------|-------|
+| `MapGenerator.scala` | 1 | Map generation |
+
+### Root library/ (8 imports, 3 files)
+
+| File | Imports | Notes |
+|------|---------|-------|
+| `ActionResultFilter.scala` | 2 | Action result filtering (boundary, uses Scala types internally) |
+| `Engine.scala` | 1 | Trait interface |
+| `EngineImpl.scala` | 5 | Returns proto for persistence (boundary) |
+
+### actions/llm_prompt_generators/ (56 imports, 34 files)
+
+These files generate LLM prompts and primarily use `internal.generated_text_request.*` types plus some common enums like `DiplomacyOfferStatus` and `BattalionTypeId`.
+
+**Migration strategy**: Can be migrated to Scala types when convenient, but low priority as they're isolated from core game logic.
+
+---
+
+## Migration Pattern
+
+The codebase follows a **Legacy* pattern** for separating proto-dependent and protoless code:
+
+- **Protoless utilities**: `FactionUtils`, `HeroUtils`, `ProvinceUtils`, `ProvinceDistances`, etc.
+- **Proto-dependent utilities**: `LegacyFactionUtils`, `LegacyHeroUtils`, `LegacyProvinceUtils`, etc.
+
+When migrating a file:
+1. Create a `Legacy*` version containing the proto-dependent methods
+2. Keep the original file name for protoless methods
+3. Update callers to use the appropriate version based on their context
+4. Delete `Legacy*` files when no longer needed
+
+### Deleted Legacy Files (no production callers)
+- `LegacyProvinceDistances`
+- `LegacyBattalionSuitability`
+- `LegacyFoodConsumptionUtils`
+- `LegacyHandleRiotUtils`

docs/LLM_MODEL_COMPARISON.md

@@ -1,94 +0,0 @@
-# LLM Model Comparison
-
-This document compares streaming latency (time-to-first-token) and pricing across OpenAI, Anthropic (Claude), and Google (Gemini) models for use in Eagle's narrative text generation.
-
-## Test Methodology
-
-All tests were performed locally using curl with streaming enabled. Each model was tested 3 times with the same prompt:
-
-> "Write a short paragraph about a brave knight who discovers a hidden cave. Make it vivid and descriptive."
-
-Time-to-first-token (TTFT) was measured from request initiation to the first text content appearing in the stream.
-
-## Streaming Latency Results (January 2026)
-
-| Model | Run 1 | Run 2 | Run 3 | Average TTFT |
-|-------|-------|-------|-------|--------------|
-| **Gemini 2.5 Flash-Lite** | 0.76s | 0.54s | 0.53s | **~0.6s** |
-| **gpt-4.1-mini** | 1.65s | 1.72s | 1.68s | **~1.7s** |
-| **claude-3-5-haiku** | 1.85s | 1.92s | 1.88s | **~1.9s** |
-| gpt-5.2 | 3.25s | 3.38s | 3.32s | **~3.3s** |
-| gpt-5-mini | 2.52s | 5.82s | 3.12s | **~3.8s** (high variance) |
-| Gemini 3 Flash Preview | 4.11s | 4.77s | 4.28s | **~4.4s** |
-| claude-sonnet-4 | 4.89s | 5.12s | 4.98s | **~5.0s** |
-| Gemini 2.5 Flash | 5.60s | 7.00s | 7.79s | **~6.8s** |
-
-## Pricing Comparison (per 1M tokens)
-
-| Model | Input Price | Output Price | Notes |
-|-------|-------------|--------------|-------|
-| **Gemini 2.5 Flash-Lite** | $0.10 | $0.40 | Cheapest and fastest |
-| Gemini 2.5 Flash | $0.15 | $0.60 | |
-| gpt-5-mini | $0.25 | $2.00 | |
-| **gpt-4.1-mini** | $0.40 | $1.60 | Best OpenAI value |
-| Gemini 3 Flash Preview | $0.50 | $3.00 | Includes thinking tokens |
-| **claude-3-5-haiku** | $0.80 | $4.00 | Best Anthropic value |
-| gpt-5.2 | ~$1.00 | ~$10.00 | Full reasoning model |
-| Gemini 2.5 Pro | $1.25 | $10.00 | |
-| Gemini 3 Pro Preview | $2.00 | $12.00 | ≤200K context |
-| claude-sonnet-4 | $3.00 | $15.00 | |
-
-## Recommendations
-
-### For Narrative Text Generation (Default)
-
-**Gemini 2.5 Flash-Lite** is recommended as the default:
-- Fastest TTFT (~0.6s) - nearly 3x faster than alternatives
-- Cheapest pricing ($0.10/$0.40 per 1M tokens)
-- Quality is acceptable for short narrative snippets
-
-### Alternative Options
-
-| Priority | Model | When to Use |
-|----------|-------|-------------|
-| Speed + Cost | Gemini 2.5 Flash-Lite | Default for most use cases |
-| Speed + Quality | gpt-4.1-mini | When you need OpenAI quality with good speed |
-| Instruction Following | claude-3-5-haiku | Complex multi-step prompts, consistent tone |
-| Maximum Quality | claude-sonnet-4 or gpt-5.2 | When output quality is paramount |
-
-### Quality Trade-offs
-
-For short narrative snippets (1-3 paragraphs):
-- **Flash-Lite vs Haiku/4.1-mini**: Minor quality difference, significant speed gain
-- **Haiku vs Sonnet**: Noticeable quality difference in creative writing variety
-- **gpt-4.1-mini vs gpt-5.2**: Moderate quality difference, significant cost savings
-
-## Configuration
-
-LLM settings can be changed at runtime via the admin console:
-
-1. Navigate to Admin Console → Settings
-2. Change `LlmProvider` to select vendor (gemini, openai, claude)
-3. Change the corresponding model name setting:
-   - `GeminiModelName` (default: gemini-2.5-flash-lite)
-   - `OpenAiModelName` (default: gpt-4.1-mini)
-   - `ClaudeModelName` (default: claude-3-5-haiku-20241022)
-
-Changes take effect on the next LLM request.
-
-## Environment Variables
-
-For production deployment, ensure API keys are set:
-
-```bash
-OPENAI_API_KEY=sk-...
-ANTHROPIC_API_KEY=sk-ant-...
-GEMINI_API_KEY=AIza...
-```
-
-## Notes
-
-- **gpt-5-mini** showed high latency variance (2.5s - 5.8s) in testing
-- **Gemini 2.5 Flash** was surprisingly slower than Flash-Lite, possibly due to internal reasoning overhead
-- **Gemini 3 Flash** is a frontier model with better quality but higher latency than 2.5 Flash-Lite
-- All Gemini models have a generous free tier (up to 1,000 daily requests)

docs/SMALL_EAGLE_TODO.md

@@ -1,78 +0,0 @@
-# The Small Eagle TODO
-
-## Goals
-
-Be able to support a small (10-50 user) private alpha, including with strangers.
-
-Larger set of goals in [The Big Eagle TODO](https://docs.google.com/document/d/17RTt3-4Wl2AAVMRLodaC3a84E4de6xuQTWBPvCRM484/edit?pli=1&tab=t.0), but most of that is not necessary for MVP.
-
-## Required
-
-### Gameplay Productionization
-
-- [x] ~~All functionality works on production eagle / shardok servers~~
-- [x] ~~Acceptable latency in all regions~~
-- [x] ~~Shardok performance similar to QA~~
-- [x] ~~Error logging & alerting~~
-- [x] ~~Fix long disconnects on deployments~~
-- [ ] Fix the Mac installer
-- [x] ~~Still not reconnecting after deployments~~
-- [ ] Notify about client updates, button to come directly back
-- [ ] Generatedtext healing
-- [ ] Kill outstanding shardok requests when game is deleted
-
-### Other Productionization
-
-- [x] ~~Oauth sign-in~~
-  - [x] ~~Add Google, others?~~
-- [ ] User management
-  - [x] ~~Invite codes~~
-  - [ ] Link accounts
-  - [x] ~~Choose display name~~
-  - [x] ~~Just do account setup from the landing page?~~
-- [x] ~~Download client directly from DO, avoid basic auth/my home network~~
-- [ ] "Message of the day"
-- [ ] Support plan
-
-### Alpha Tester Support
-
-- [ ] Feedback channel (Discord server? Bug report form?)
-- [ ] Crash reporting from Unity client
-- [ ] Known issues doc (so testers don't report the same things)
-
-### IP / Legal
-
-- [ ] Document and make available licenses for art & music
-- [ ] Required open source disclosures
-- [ ] Audit assets for anything we don't have rights to and replace it
-- [ ] Replace heroes that are based on real 20th or 21st century people or IP
-- [ ] Privacy policy (collecting accounts, OAuth data, gameplay data)
-- [ ] Terms of service (basic liability protection)
-- [ ] Data deletion capability (user requests account removal)
-
-### Basic Gameplay
-
-- [ ] Tutorial
-  - [ ] In the Your Warlord panel, say what the profession is
-  - [x] ~~And separate panels for each profession when you encounter one~~
-  - [x] ~~Command tutorial for each command the first time it's clicked~~
-  - [x] ~~Time to recruit / expand~~
-    - [x] ~~And how expansion works~~
-  - [ ] Province events
-  - [ ] Running low on food
-  - [x] ~~Time to swear brotherhood~~
-    - [x] ~~When you get large, or~~
-    - [x] ~~When you get a good candidate~~
-  - [ ] Shardok tutorial!
-- [ ] Basic Shardok AI stuff fixed
-- [ ] Lobby fixes
-- [ ] Have goals / ending
-- [ ] First-session onboarding (beyond mechanics tutorial)
-  - [ ] Narrative hook in first few minutes - why should I care about my warlord?
-  - [ ] Clear first-session goal ("try to capture your first province" or similar)
-  - [ ] Early small victory to build momentum
-  - [ ] Guided first scenario vs. overwhelming sandbox?
-
-## Nice to have
-
-<!-- Add nice-to-have items here as they come up -->

docs/SPARKLE_DELTA_UPDATES.md

@@ -1,568 +0,0 @@
-# Sparkle Delta Updates Implementation Plan
-
-## Overview
-
-This document outlines the implementation plan for adding delta update support to the Eagle0 macOS auto-update system using Sparkle's BinaryDelta feature.
-
-### Current State
-- Full DMG downloads (~200MB) for every update
-- `mac_build_handler.go` creates DMG, signs it, uploads to S3, updates appcast.xml
-- Keeps last 10 versions in appcast, deletes older DMGs
-- Users must download full app even for small changes
-
-### Goals
-- Reduce update download size from ~200MB to ~10-30MB (85% reduction)
-- Maintain backward compatibility with full DMG downloads
-- Automatic fallback for users who are many versions behind
-
-## Sparkle Delta Update Architecture
-
-Sparkle supports binary delta updates through the `<sparkle:deltas>` element in the appcast. When a user updates, Sparkle:
-1. Checks if a delta patch exists from their current version to the new version
-2. If found, downloads the smaller delta patch instead of the full DMG
-3. Applies the patch locally to create the new app version
-4. Falls back to full DMG if no matching delta exists
-
-### Appcast XML Structure with Deltas
-
-```xml
-<?xml version="1.0" encoding="UTF-8"?>
-<rss version="2.0" xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle">
-  <channel>
-    <title>Eagle0</title>
-    <link>https://assets.eagle0.net/mac/appcast.xml</link>
-    <description>Eagle0 game updates</description>
-    <language>en</language>
-    <item>
-      <title>Version 1.0.9615</title>
-      <pubDate>Sun, 19 Jan 2026 12:00:00 -0800</pubDate>
-      <sparkle:version>9615</sparkle:version>
-      <sparkle:shortVersionString>1.0.9615</sparkle:shortVersionString>
-      <enclosure
-        url="https://assets.eagle0.net/mac/builds/eagle0-1.0.9615.dmg"
-        length="200000000"
-        type="application/octet-stream"
-        sparkle:edSignature="..." />
-      <sparkle:deltas>
-        <enclosure
-          url="https://assets.eagle0.net/mac/deltas/9614-9615.delta"
-          sparkle:deltaFrom="9614"
-          length="15000000"
-          type="application/octet-stream"
-          sparkle:edSignature="..." />
-        <enclosure
-          url="https://assets.eagle0.net/mac/deltas/9613-9615.delta"
-          sparkle:deltaFrom="9613"
-          length="18000000"
-          type="application/octet-stream"
-          sparkle:edSignature="..." />
-        <enclosure
-          url="https://assets.eagle0.net/mac/deltas/9612-9615.delta"
-          sparkle:deltaFrom="9612"
-          length="22000000"
-          type="application/octet-stream"
-          sparkle:edSignature="..." />
-      </sparkle:deltas>
-    </item>
-    <!-- older versions... -->
-  </channel>
-</rss>
-```
-
-## Implementation Plan
-
-### Phase 1: Add S3 Utility Functions
-
-**File:** `src/main/go/net/eagle0/util/aws/bucket_basics.go`
-
-Add two new functions to support delta generation:
-
-```go
-// ListObjectsWithPrefix returns all object keys matching the given prefix
-func (bb BucketBasics) ListObjectsWithPrefix(bucket, prefix string) ([]string, error) {
-    var keys []string
-    paginator := s3.NewListObjectsV2Paginator(bb.S3Client, &s3.ListObjectsV2Input{
-        Bucket: aws.String(bucket),
-        Prefix: aws.String(prefix),
-    })
-
-    for paginator.HasMorePages() {
-        page, err := paginator.NextPage(context.TODO())
-        if err != nil {
-            return nil, err
-        }
-        for _, obj := range page.Contents {
-            keys = append(keys, *obj.Key)
-        }
-    }
-    return keys, nil
-}
-
-// DownloadFile downloads an object to a local file path
-func (bb BucketBasics) DownloadFile(bucket, key, localPath string) error {
-    result, err := bb.S3Client.GetObject(context.TODO(), &s3.GetObjectInput{
-        Bucket: aws.String(bucket),
-        Key:    aws.String(key),
-    })
-    if err != nil {
-        return err
-    }
-    defer result.Body.Close()
-
-    file, err := os.Create(localPath)
-    if err != nil {
-        return err
-    }
-    defer file.Close()
-
-    _, err = io.Copy(file, result.Body)
-    return err
-}
-```
-
-### Phase 2: Store App Bundles for Delta Generation
-
-**File:** `src/main/go/net/eagle0/build/mac_build_handler/mac_build_handler.go`
-
-Add storage paths:
-```go
-var appsRoot = "mac/apps/"      // Zipped app bundles for delta generation
-var deltasRoot = "mac/deltas/"  // Delta patches
-```
-
-After DMG creation, upload the zipped app bundle:
-```go
-func uploadAppBundle(bb aws.BucketBasics, appPath string, buildNumber string) error {
-    appZipPath := filepath.Join("/tmp", fmt.Sprintf("eagle0-%s.app.zip", buildNumber))
-
-    // Create zip of app bundle using ditto (preserves metadata)
-    cmd := exec.Command("ditto", "-c", "-k", "--keepParent", appPath, appZipPath)
-    if output, err := cmd.CombinedOutput(); err != nil {
-        return fmt.Errorf("failed to zip app: %s: %w", string(output), err)
-    }
-    defer os.Remove(appZipPath)
-
-    // Upload to S3
-    remotePath := appsRoot + fmt.Sprintf("eagle0-%s.app.zip", buildNumber)
-    log.Printf("Uploading app bundle to S3: %s", remotePath)
-    return bb.UploadFilePublic(bucketName, remotePath, appZipPath)
-}
-```
-
-### Phase 3: Add Delta XML Structures
-
-**File:** `src/main/go/net/eagle0/build/mac_build_handler/mac_build_handler.go`
-
-Add new structs for delta representation:
-```go
-// Delta represents a delta patch from a previous version
-type Delta struct {
-    XMLName   xml.Name `xml:"enclosure"`
-    URL       string   `xml:"url,attr"`
-    DeltaFrom string   `xml:"sparkle:deltaFrom,attr"`
-    Length    int64    `xml:"length,attr"`
-    Type      string   `xml:"type,attr"`
-    EdSig     string   `xml:"sparkle:edSignature,attr"`
-}
-
-// Deltas wraps the sparkle:deltas element
-type Deltas struct {
-    XMLName xml.Name `xml:"sparkle:deltas"`
-    Items   []Delta  `xml:"enclosure"`
-}
-
-// Update Item struct to include Deltas
-type Item struct {
-    Title               string     `xml:"title"`
-    PubDate             string     `xml:"pubDate"`
-    SparkleVersion      string     `xml:"sparkle:version"`
-    SparkleShortVersion string     `xml:"sparkle:shortVersionString"`
-    Description         string     `xml:"description,omitempty"`
-    Enclosure           Enclosure  `xml:"enclosure"`
-    Deltas              *Deltas    `xml:"sparkle:deltas,omitempty"`
-}
-```
-
-### Phase 4: Generate Delta Patches
-
-**File:** `src/main/go/net/eagle0/build/mac_build_handler/mac_build_handler.go`
-
-```go
-// Maximum number of versions to generate deltas from
-const maxDeltaVersions = 5
-
-// generateDeltas creates delta patches from previous versions to the new version
-func generateDeltas(bb aws.BucketBasics, newBuildNumber string, newAppPath string, privateKeyPath string) ([]Delta, error) {
-    var deltas []Delta
-
-    // Ensure BinaryDelta tool is available
-    binaryDeltaPath, err := ensureBinaryDelta()
-    if err != nil {
-        return nil, fmt.Errorf("failed to get BinaryDelta: %w", err)
-    }
-
-    // List available app bundles
-    appKeys, err := bb.ListObjectsWithPrefix(bucketName, appsRoot+"eagle0-")
-    if err != nil {
-        log.Printf("Warning: failed to list app bundles: %v", err)
-        return deltas, nil // Continue without deltas
-    }
-
-    // Parse build numbers from keys and sort descending
-    var buildNumbers []string
-    for _, key := range appKeys {
-        // Extract build number from "mac/apps/eagle0-9614.app.zip"
-        base := filepath.Base(key)
-        if strings.HasPrefix(base, "eagle0-") && strings.HasSuffix(base, ".app.zip") {
-            bn := strings.TrimSuffix(strings.TrimPrefix(base, "eagle0-"), ".app.zip")
-            if bn != newBuildNumber {
-                buildNumbers = append(buildNumbers, bn)
-            }
-        }
-    }
-
-    // Sort descending (most recent first) and limit to maxDeltaVersions
-    sort.Sort(sort.Reverse(sort.StringSlice(buildNumbers)))
-    if len(buildNumbers) > maxDeltaVersions {
-        buildNumbers = buildNumbers[:maxDeltaVersions]
-    }
-
-    // Generate delta from each previous version
-    for _, oldBuild := range buildNumbers {
-        delta, err := generateSingleDelta(bb, binaryDeltaPath, oldBuild, newBuildNumber, newAppPath, privateKeyPath)
-        if err != nil {
-            log.Printf("Warning: failed to generate delta from %s: %v", oldBuild, err)
-            continue // Skip this delta but continue with others
-        }
-        deltas = append(deltas, delta)
-    }
-
-    return deltas, nil
-}
-
-func generateSingleDelta(bb aws.BucketBasics, binaryDeltaPath, oldBuild, newBuild, newAppPath, privateKeyPath string) (Delta, error) {
-    // Download old app bundle
-    oldAppZipKey := appsRoot + fmt.Sprintf("eagle0-%s.app.zip", oldBuild)
-    oldAppZipLocal := filepath.Join("/tmp", fmt.Sprintf("eagle0-%s.app.zip", oldBuild))
-    defer os.Remove(oldAppZipLocal)
-
-    if err := bb.DownloadFile(bucketName, oldAppZipKey, oldAppZipLocal); err != nil {
-        return Delta{}, fmt.Errorf("failed to download old app: %w", err)
-    }
-
-    // Unzip old app
-    oldAppDir := filepath.Join("/tmp", fmt.Sprintf("old-app-%s", oldBuild))
-    defer os.RemoveAll(oldAppDir)
-
-    cmd := exec.Command("ditto", "-x", "-k", oldAppZipLocal, oldAppDir)
-    if output, err := cmd.CombinedOutput(); err != nil {
-        return Delta{}, fmt.Errorf("failed to unzip old app: %s: %w", string(output), err)
-    }
-
-    oldAppPath := filepath.Join(oldAppDir, "eagle0.app")
-
-    // Generate delta
-    deltaPath := filepath.Join("/tmp", fmt.Sprintf("%s-%s.delta", oldBuild, newBuild))
-    defer os.Remove(deltaPath)
-
-    cmd = exec.Command(binaryDeltaPath, "create", oldAppPath, newAppPath, deltaPath)
-    if output, err := cmd.CombinedOutput(); err != nil {
-        return Delta{}, fmt.Errorf("failed to create delta: %s: %w", string(output), err)
-    }
-
-    // Get delta size
-    deltaSize, err := getFileSize(deltaPath)
-    if err != nil {
-        return Delta{}, fmt.Errorf("failed to get delta size: %w", err)
-    }
-    log.Printf("Delta %s->%s size: %d bytes (%.1f MB)", oldBuild, newBuild, deltaSize, float64(deltaSize)/1024/1024)
-
-    // Sign delta
-    signature, err := signWithSparkle(deltaPath, privateKeyPath)
-    if err != nil {
-        return Delta{}, fmt.Errorf("failed to sign delta: %w", err)
-    }
-
-    // Upload delta
-    deltaKey := deltasRoot + fmt.Sprintf("%s-%s.delta", oldBuild, newBuild)
-    if err := bb.UploadFilePublic(bucketName, deltaKey, deltaPath); err != nil {
-        return Delta{}, fmt.Errorf("failed to upload delta: %w", err)
-    }
-
-    deltaURL := fmt.Sprintf("https://assets.eagle0.net/%s", deltaKey)
-    return Delta{
-        URL:       deltaURL,
-        DeltaFrom: oldBuild,
-        Length:    deltaSize,
-        Type:      "application/octet-stream",
-        EdSig:     signature,
-    }, nil
-}
-
-func ensureBinaryDelta() (string, error) {
-    binaryDeltaPath := "/tmp/sparkle-cache/Sparkle-2.6.4/bin/BinaryDelta"
-
-    if _, err := os.Stat(binaryDeltaPath); os.IsNotExist(err) {
-        log.Println("Sparkle BinaryDelta not found, downloading...")
-        cmd := exec.Command("bash", "-c", `
-            mkdir -p /tmp/sparkle-cache
-            curl -sL https://github.com/sparkle-project/Sparkle/releases/download/2.6.4/Sparkle-2.6.4.tar.xz | tar -xJ -C /tmp/sparkle-cache
-        `)
-        if output, err := cmd.CombinedOutput(); err != nil {
-            return "", fmt.Errorf("failed to download Sparkle: %s: %w", string(output), err)
-        }
-    }
-
-    return binaryDeltaPath, nil
-}
-```
-
-### Phase 5: Update Main Deploy Flow
-
-**File:** `src/main/go/net/eagle0/build/mac_build_handler/mac_build_handler.go`
-
-Modify `main()` to integrate delta generation:
-
-```go
-func main() {
-    // ... existing argument parsing ...
-
-    // Create DMG (existing)
-    if err := createDMG(appPath, dmgPath, "Eagle0"); err != nil {
-        log.Fatalf("Failed to create DMG: %v", err)
-    }
-
-    // ... existing DMG upload ...
-
-    if privateKeyPath != "" {
-        // Upload app bundle for future delta generation (NEW)
-        log.Println("Uploading app bundle for delta generation...")
-        if err := uploadAppBundle(bb, appPath, buildNumber); err != nil {
-            log.Printf("Warning: failed to upload app bundle: %v", err)
-            // Continue - delta generation is optional
-        }
-
-        // Generate deltas from previous versions (NEW)
-        log.Println("Generating delta patches...")
-        deltas, err := generateDeltas(bb, buildNumber, appPath, privateKeyPath)
-        if err != nil {
-            log.Printf("Warning: failed to generate deltas: %v", err)
-        } else {
-            log.Printf("Generated %d delta patches", len(deltas))
-        }
-
-        // Update appcast with deltas
-        log.Println("Updating appcast.xml...")
-        appcast, err := fetchAppcast(bb)
-        if err != nil {
-            log.Fatalf("Failed to fetch appcast: %v", err)
-        }
-
-        // Create new item with deltas
-        newItem := Item{
-            Title:               fmt.Sprintf("Version %s", version),
-            PubDate:             time.Now().Format(time.RFC1123Z),
-            SparkleVersion:      buildNumber,
-            SparkleShortVersion: version,
-            Description:         "",
-            Enclosure: Enclosure{
-                URL:    downloadURL,
-                Length: fileSize,
-                Type:   "application/octet-stream",
-                EdSig:  signature,
-            },
-        }
-
-        // Add deltas if any were generated
-        if len(deltas) > 0 {
-            newItem.Deltas = &Deltas{Items: deltas}
-        }
-
-        // ... rest of appcast handling ...
-    }
-}
-```
-
-### Phase 6: Cleanup Old Artifacts
-
-**File:** `src/main/go/net/eagle0/build/mac_build_handler/mac_build_handler.go`
-
-When pruning old versions from appcast, also delete associated artifacts:
-
-```go
-// In the appcast pruning section, after removing old items:
-if len(appcast.Channel.Items) > 10 {
-    oldItems := appcast.Channel.Items[10:]
-    for _, item := range oldItems {
-        oldBuild := item.SparkleVersion
-
-        // Delete old DMG (existing)
-        dmgKey := strings.TrimPrefix(item.Enclosure.URL, "https://assets.eagle0.net/")
-        log.Printf("Deleting old build: %s", dmgKey)
-        bb.DeleteObject(bucketName, dmgKey)
-
-        // Delete old app bundle (NEW)
-        appKey := appsRoot + fmt.Sprintf("eagle0-%s.app.zip", oldBuild)
-        log.Printf("Deleting old app bundle: %s", appKey)
-        bb.DeleteObject(bucketName, appKey)
-
-        // Delete deltas TO this version (NEW)
-        deltaKeys, _ := bb.ListObjectsWithPrefix(bucketName, deltasRoot)
-        for _, key := range deltaKeys {
-            if strings.HasSuffix(key, fmt.Sprintf("-%s.delta", oldBuild)) {
-                log.Printf("Deleting old delta: %s", key)
-                bb.DeleteObject(bucketName, key)
-            }
-        }
-    }
-    appcast.Channel.Items = appcast.Channel.Items[:10]
-}
-```
-
-## S3 Storage Structure
-
-After implementation, the S3 bucket will have this structure:
-
-```
-eagle0-windows/
-├── mac/
-│   ├── appcast.xml                    # Update feed with delta info
-│   ├── builds/                        # Full DMG downloads
-│   │   ├── eagle0-1.0.9620.dmg
-│   │   ├── eagle0-1.0.9619.dmg
-│   │   ├── ...
-│   │   └── eagle0-latest.dmg          # Symlink to latest
-│   ├── apps/                          # Zipped app bundles (NEW)
-│   │   ├── eagle0-9620.app.zip
-│   │   ├── eagle0-9619.app.zip
-│   │   ├── eagle0-9618.app.zip
-│   │   ├── eagle0-9617.app.zip
-│   │   └── eagle0-9616.app.zip        # Keep last 5 for delta gen
-│   └── deltas/                        # Delta patches (NEW)
-│       ├── 9619-9620.delta
-│       ├── 9618-9620.delta
-│       ├── 9617-9620.delta
-│       ├── 9616-9620.delta
-│       ├── 9615-9620.delta
-│       ├── 9618-9619.delta
-│       ├── 9617-9619.delta
-│       └── ...
-```
-
-## Storage Impact Analysis
-
-### Current Storage (without deltas)
-- 10 DMGs × 200MB = **~2GB**
-
-### Estimated Storage (with deltas)
-- 10 DMGs × 200MB = 2GB
-- 5 app bundles × 150MB = 0.75GB (zip compression)
-- ~25 delta files × 20MB avg = 0.5GB
-- **Total: ~3.25GB**
-
-### Trade-offs
-- **+1.25GB storage** (~60% increase)
-- **-170MB per user update** (~85% bandwidth savings)
-- Break-even: ~8 user updates to recoup storage cost
-
-## Bandwidth Savings
-
-| Scenario | Without Deltas | With Deltas | Savings |
-|----------|---------------|-------------|---------|
-| 1 version behind | 200MB | ~15MB | 92% |
-| 2 versions behind | 200MB | ~20MB | 90% |
-| 3 versions behind | 200MB | ~25MB | 87% |
-| 5 versions behind | 200MB | ~35MB | 82% |
-| 6+ versions behind | 200MB | 200MB (full) | 0% |
-
-## Migration Strategy
-
-The implementation is backward-compatible and requires no changes to existing clients:
-
-1. **First deploy after implementation:**
-   - Stores app bundle for the first time
-   - No deltas generated (no previous app bundles exist)
-   - Appcast has no `<sparkle:deltas>` element
-
-2. **Second deploy:**
-   - Generates delta from previous version
-   - Appcast now has `<sparkle:deltas>` with one entry
-   - Users on previous version get delta update
-
-3. **Subsequent deploys:**
-   - Generate deltas from last 5 versions
-   - Users within 5 versions get delta updates
-   - Users more than 5 versions behind get full DMG
-
-4. **Client behavior:**
-   - Sparkle automatically checks for matching delta
-   - Falls back to full DMG if no delta matches
-   - No client code changes required
-
-## Error Handling
-
-The implementation handles failures gracefully:
-
-1. **S3 list/download fails:** Skip delta generation, use full DMG
-2. **BinaryDelta fails for one version:** Log warning, continue with other versions
-3. **Signing fails:** Skip that delta, continue with others
-4. **Upload fails:** Skip that delta, continue with others
-
-The deploy never fails due to delta issues - deltas are optional enhancements.
-
-## Verification Plan
-
-### Manual Testing
-
-1. **Deploy version N:**
-   - Verify app bundle uploaded to `mac/apps/eagle0-N.app.zip`
-   - Verify appcast has no deltas (first deploy)
-
-2. **Deploy version N+1:**
-   - Verify delta generated at `mac/deltas/N-(N+1).delta`
-   - Verify appcast contains `<sparkle:deltas>` element
-   - Verify delta signature is valid
-
-3. **Test update from N to N+1:**
-   - Install version N manually
-   - Check for updates
-   - Monitor download size in Player.log (should be ~15-30MB, not 200MB)
-   - Verify app updated successfully
-
-4. **Test fresh install:**
-   - Download latest DMG directly
-   - Verify installation works normally
-
-5. **Test fallback scenario:**
-   - Install a version more than 5 versions behind
-   - Update should download full DMG
-
-### Automated Verification
-
-Add to CI workflow (optional):
-```yaml
-- name: Verify delta generation
-  run: |
-    # Check app bundle exists
-    aws s3 ls s3://eagle0-windows/mac/apps/ | grep eagle0-${BUILD_NUMBER}.app.zip
-
-    # Check deltas exist (after second deploy)
-    aws s3 ls s3://eagle0-windows/mac/deltas/ | head -5
-
-    # Verify appcast has deltas
-    curl -s https://assets.eagle0.net/mac/appcast.xml | grep "sparkle:deltas"
-```
-
-## Security Considerations
-
-1. **All deltas are EdDSA signed:** Same signature verification as full DMG
-2. **BinaryDelta is Sparkle's official tool:** Well-audited, production-ready
-3. **App bundles in S3 are public:** Same as DMGs, no additional exposure
-4. **Cleanup removes old artifacts:** No indefinite storage of old versions
-
-## Future Enhancements
-
-1. **Parallel delta generation:** Generate multiple deltas concurrently
-2. **Delta size threshold:** Skip uploading deltas larger than X% of full DMG
-3. **Delta metrics:** Track delta download rates vs full DMG
-4. **Configurable delta count:** Allow adjusting how many versions to keep

external/BUILD.llvm_mingw

@@ -1,48 +0,0 @@
-# LLVM MinGW toolchain for Windows cross-compilation
-# Provides x86_64-w64-mingw32 target compiler and libraries
-
-package(default_visibility = ["//visibility:public"])
-
-filegroup(
-    name = "all_files",
-    srcs = glob(["**/*"]),
-)
-
-# Compiler binaries
-filegroup(
-    name = "compiler_files",
-    srcs = glob([
-        "bin/x86_64-w64-mingw32-*",
-        "bin/clang*",
-        "bin/llvm-*",
-        "bin/lld*",
-    ]),
-)
-
-# Windows x86_64 sysroot (headers and libraries)
-filegroup(
-    name = "windows_x86_64_sysroot",
-    srcs = glob([
-        "x86_64-w64-mingw32/**/*",
-        "generic-w64-mingw32/include/**/*",
-    ]),
-)
-
-# All library files needed for linking
-filegroup(
-    name = "linker_files",
-    srcs = glob([
-        "bin/x86_64-w64-mingw32-*",
-        "bin/lld*",
-        "bin/ld.lld*",
-        "lib/**/*",
-        "x86_64-w64-mingw32/lib/**/*",
-    ]),
-)
-
-# The main C compiler wrapper script path for CGO
-# CGO needs CC to point to the cross-compiler
-exports_files([
-    "bin/x86_64-w64-mingw32-clang",
-    "bin/x86_64-w64-mingw32-clang++",
-])

go.mod

@@ -11,8 +11,6 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/s3 v1.72.2
 	github.com/golang-jwt/jwt/v5 v5.2.1
 	github.com/google/uuid v1.6.0
-	github.com/webview/webview_go v0.0.0-20240831120633-6173450d4dd6
-	golang.org/x/sys v0.28.0
 	google.golang.org/grpc v1.68.0
 	google.golang.org/protobuf v1.36.3
 )

go.sum

@@ -41,10 +41,6 @@ github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/webview/webview_go v0.0.0-20240831120633-6173450d4dd6 h1:VQpB2SpK88C6B5lPHTuSZKb2Qee1QWwiFlC5CKY4AW0=
-github.com/webview/webview_go v0.0.0-20240831120633-6173450d4dd6/go.mod h1:yE65LFCeWf4kyWD5re+h4XNvOHJEXOCOuJZ4v8l5sgk=
-golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
-golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
 golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

nginx/nginx.conf

@@ -119,13 +119,6 @@ http {
             proxy_set_header X-Real-IP $remote_addr;
         }
 
-        # Steam OAuth callback (Steam uses OpenID 2.0)
-        location /oauth/steam/callback {
-            proxy_pass http://auth:8080;
-            proxy_set_header Host $host;
-            proxy_set_header X-Real-IP $remote_addr;
-        }
-
         # Invitation landing page (proxied to Go auth service)
         location /invite/ {
             proxy_pass http://auth:8080;

scripts/check_build_deps.sh

@@ -1,129 +0,0 @@
-#!/bin/bash
-# Check BUILD.bazel dependency constraints
-# This script enforces architectural boundaries in the codebase.
-#
-# Usage:
-#   ./scripts/check_build_deps.sh           # Check all rules
-#   ./scripts/check_build_deps.sh --ci      # CI mode (fail on any violation)
-#   ./scripts/check_build_deps.sh --count   # Just count current violations (for tracking progress)
-#   ./scripts/check_build_deps.sh --strict  # Same as --ci (strict enforcement)
-
-set -e
-
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-REPO_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
-cd "$REPO_ROOT"
-
-RED='\033[0;31m'
-GREEN='\033[0;32m'
-YELLOW='\033[1;33m'
-NC='\033[0m' # No Color
-
-MODE="${1:-check}"
-EXIT_CODE=0
-
-# Rule 1: src/main should not depend on src/test
-check_main_depends_on_test() {
-    echo -e "${YELLOW}Checking: src/main should not depend on src/test...${NC}"
-
-    violations=$(bazel query 'deps(//src/main/...) intersect //src/test/...' 2>/dev/null || true)
-
-    if [ -n "$violations" ]; then
-        echo -e "${RED}VIOLATION: src/main depends on src/test:${NC}"
-        echo "$violations"
-        return 1
-    else
-        echo -e "${GREEN}✓ No violations${NC}"
-        return 0
-    fi
-}
-
-# Rule 2: library/ should not depend on Scala proto types
-# C++/Go proto deps are allowed (they're build-time deps for map generation tools)
-check_library_depends_on_scala_proto() {
-    echo -e "${YELLOW}Checking: library/ should not depend on Scala proto types...${NC}"
-
-    violations=$(bazel query 'deps(//src/main/scala/net/eagle0/eagle/library/...) intersect //src/main/protobuf/...' 2>/dev/null | grep "_scala_proto" || true)
-    if [ -z "$violations" ]; then
-        count=0
-    else
-        count=$(echo "$violations" | grep -c "^//" || true)
-    fi
-
-    if [ "$count" -gt 0 ]; then
-        echo -e "${RED}VIOLATION: Found $count Scala proto dependencies in library/:${NC}"
-        echo "$violations"
-        return 1
-    else
-        echo -e "${GREEN}✓ No Scala proto dependencies in library/${NC}"
-        return 0
-    fi
-}
-
-# Rule 3: library/ should not depend on proto_converters
-# Proto conversions should happen at service boundaries, not in library code
-check_library_depends_on_proto_converters() {
-    echo -e "${YELLOW}Checking: library/ should not depend on proto_converters...${NC}"
-
-    violations=$(bazel query 'deps(//src/main/scala/net/eagle0/eagle/library/...) intersect //src/main/scala/net/eagle0/eagle/model/proto_converters/...' 2>/dev/null | grep "^//" || true)
-
-    if [ -n "$violations" ]; then
-        count=$(echo "$violations" | wc -l | tr -d ' ')
-        echo -e "${RED}VIOLATION: library/ depends on $count proto_converters targets:${NC}"
-        echo "$violations"
-        echo ""
-        echo "Proto conversions should happen at service boundaries (ShardokInterfaceGrpcClient,"
-        echo "EagleServiceImpl, etc.), not in library code."
-        return 1
-    else
-        echo -e "${GREEN}✓ No proto_converters dependencies in library/${NC}"
-        return 0
-    fi
-}
-
-# Count proto deps for informational purposes
-count_proto_deps() {
-    echo -e "${YELLOW}=== Proto dependency counts ===${NC}"
-
-    scala_proto_results=$(bazel query 'deps(//src/main/scala/net/eagle0/eagle/library/...) intersect //src/main/protobuf/...' 2>/dev/null | grep "_scala_proto" || true)
-    if [ -z "$scala_proto_results" ]; then
-        scala_proto_count=0
-    else
-        scala_proto_count=$(echo "$scala_proto_results" | wc -l | tr -d ' ')
-    fi
-    echo "library/ Scala proto deps: $scala_proto_count"
-
-    # C++/Go proto deps are expected (map generation tools)
-    all_proto_count=$(bazel query 'deps(//src/main/scala/net/eagle0/eagle/library/...) intersect //src/main/protobuf/...' 2>/dev/null | wc -l | tr -d ' ')
-    echo "library/ all proto deps (includes C++/Go build tools): $all_proto_count"
-}
-
-echo "=== BUILD.bazel Dependency Check ==="
-echo ""
-
-case "$MODE" in
-    --count)
-        count_proto_deps
-        ;;
-    --ci|--strict)
-        check_main_depends_on_test || EXIT_CODE=1
-        check_library_depends_on_scala_proto || EXIT_CODE=1
-        check_library_depends_on_proto_converters || EXIT_CODE=1
-        ;;
-    *)
-        check_main_depends_on_test || EXIT_CODE=1
-        check_library_depends_on_scala_proto || EXIT_CODE=1
-        check_library_depends_on_proto_converters || EXIT_CODE=1
-        echo ""
-        count_proto_deps
-        ;;
-esac
-
-echo ""
-if [ $EXIT_CODE -eq 0 ]; then
-    echo -e "${GREEN}=== All checks passed ===${NC}"
-else
-    echo -e "${RED}=== Some checks failed ===${NC}"
-fi
-
-exit $EXIT_CODE

scripts/codesign_mac_app.sh

@@ -39,51 +39,32 @@ find "$APP_PATH" -name "*.bundle" -print0 | while IFS= read -r -d '' item; do
         --sign "$SIGNING_IDENTITY" "$item"
 done
 
-# Sign XPC services (but skip ones inside Sparkle.framework - they're already signed)
+# Sign XPC services (inside Sparkle framework)
 find "$APP_PATH" -name "*.xpc" -print0 | while IFS= read -r -d '' item; do
-    if [[ "$item" == *"Sparkle.framework"* ]]; then
-        echo "Skipping Sparkle XPC service (pre-signed): $item"
-        continue
-    fi
     echo "Signing XPC service: $item"
     codesign --force --verify --verbose --timestamp --options runtime \
         --sign "$SIGNING_IDENTITY" "$item"
 done
 
-# Sign nested apps (but skip ones inside Sparkle.framework - they're already signed)
+# Sign nested apps (like Sparkle's Updater.app)
 find "$APP_PATH" -path "*/Frameworks/*.app" -print0 | while IFS= read -r -d '' item; do
-    if [[ "$item" == *"Sparkle.framework"* ]]; then
-        echo "Skipping Sparkle nested app (pre-signed): $item"
-        continue
-    fi
     echo "Signing nested app: $item"
     codesign --force --verify --verbose --timestamp --options runtime \
         --sign "$SIGNING_IDENTITY" "$item"
 done
 
-# Sign standalone executables inside frameworks (but skip Sparkle.framework internals)
+# Sign standalone executables inside frameworks (like Autoupdate)
 find "$APP_PATH" -path "*/Frameworks/*/Versions/*/Autoupdate" -type f -print0 | while IFS= read -r -d '' item; do
-    if [[ "$item" == *"Sparkle.framework"* ]]; then
-        echo "Skipping Sparkle executable (pre-signed): $item"
-        continue
-    fi
     echo "Signing executable: $item"
     codesign --force --verify --verbose --timestamp --options runtime \
         --sign "$SIGNING_IDENTITY" "$item"
 done
 
 # Sign all frameworks (after their contents are signed)
-# Use --deep for Sparkle.framework to handle its XPC services
 find "$APP_PATH" -name "*.framework" -print0 | while IFS= read -r -d '' item; do
-    if [[ "$item" == *"Sparkle.framework" ]]; then
-        echo "Signing Sparkle framework with --deep: $item"
-        codesign --deep --force --verify --verbose --timestamp --options runtime \
-            --sign "$SIGNING_IDENTITY" "$item"
-    else
-        echo "Signing framework: $item"
-        codesign --force --verify --verbose --timestamp --options runtime \
-            --sign "$SIGNING_IDENTITY" "$item"
-    fi
+    echo "Signing framework: $item"
+    codesign --force --verify --verbose --timestamp --options runtime \
+        --sign "$SIGNING_IDENTITY" "$item"
 done
 
 echo "=== Signing main app bundle ==="

scripts/deploy-blue-green.sh

@@ -35,7 +35,6 @@ WARMUP_SCRIPT="${SCRIPT_DIR}/warmup-eagle.sh"
 SAVES_DIR="${APP_DIR}/saves"
 FLUSH_MARKER="${SAVES_DIR}/.flush_complete"
 DEPLOYMENT_IN_PROGRESS="${SAVES_DIR}/.deployment_in_progress"
-ACTIVE_INSTANCE_FILE="${APP_DIR}/.active-instance"
 
 # Colors for output
 RED='\033[0;31m'
@@ -265,8 +264,7 @@ main() {
     fi
 
     # Recreate nginx to pick up new config
-    # Use --no-deps to prevent cascading to auth (which has secrets not available here)
-    docker compose -f "${COMPOSE_FILE}" up -d --force-recreate --no-deps nginx
+    docker compose -f "${COMPOSE_FILE}" up -d --force-recreate nginx
 
     # Verify nginx picked up the correct config
     local nginx_backend
@@ -299,10 +297,6 @@ main() {
     create_flush_marker "${deploy_id}" "eagle-${staging}"
     log_info "[DEPLOY:${deploy_id}] Flush marker created - server will auto-invalidate stale cache"
 
-    # Write active instance file for eagle-exec helper
-    echo "eagle-${staging}" > "${ACTIVE_INSTANCE_FILE}"
-    log_info "[DEPLOY:${deploy_id}] Active instance file updated: eagle-${staging}"
-
     # Update .env for admin service
     local env_file="${APP_DIR}/.env"
     if [ "$staging" = "green" ]; then
@@ -318,9 +312,8 @@ main() {
     fi
 
     # Restart admin to pick up new .env
-    # Use --no-deps to prevent cascading to auth (which has secrets not available here)
     log_info "Restarting admin service..."
-    docker compose -f "${COMPOSE_FILE}" up -d --force-recreate --no-deps admin
+    docker compose -f "${COMPOSE_FILE}" up -d --force-recreate admin
 
     # Clean up old instance
     log_info "Cleaning up old eagle-${active}..."

scripts/eagle-exec.sh

@@ -1,46 +0,0 @@
-#!/bin/bash
-#
-# Helper to run docker exec against the active Eagle instance.
-# Reads the active instance from /opt/eagle0/.active-instance (set by deploy-blue-green.sh).
-#
-# Usage:
-#   eagle-exec printenv GEMINI_API_KEY
-#   eagle-exec jcmd 1 VM.flags
-#   eagle-exec sh    # Get a shell
-#
-# To create an alias, add to ~/.bashrc:
-#   alias eagle-exec='/opt/eagle0/scripts/eagle-exec.sh'
-#
-
-set -euo pipefail
-
-APP_DIR="${APP_DIR:-/opt/eagle0}"
-ACTIVE_FILE="${APP_DIR}/.active-instance"
-
-# Read active instance from file, with fallback
-if [ -f "$ACTIVE_FILE" ]; then
-    ACTIVE=$(cat "$ACTIVE_FILE")
-else
-    # Fallback: check which container is actually running
-    if docker inspect --format='{{.State.Running}}' eagle-blue 2>/dev/null | grep -q true; then
-        ACTIVE="eagle-blue"
-    elif docker inspect --format='{{.State.Running}}' eagle-green 2>/dev/null | grep -q true; then
-        ACTIVE="eagle-green"
-    else
-        ACTIVE=""
-    fi
-fi
-
-if [ -z "$ACTIVE" ]; then
-    echo "Error: No active Eagle instance found" >&2
-    exit 1
-fi
-
-if [ $# -eq 0 ]; then
-    echo "Active instance: $ACTIVE"
-    echo "Usage: $0 <command> [args...]"
-    echo "Example: $0 printenv GEMINI_API_KEY"
-    exit 0
-fi
-
-exec docker exec "$ACTIVE" "$@"

scripts/eagle-logs.sh

@@ -1,44 +0,0 @@
-#!/bin/bash
-#
-# Helper to tail logs from the active Eagle instance.
-# Reads the active instance from /opt/eagle0/.active-instance (set by deploy-blue-green.sh).
-#
-# Usage:
-#   eagle-logs           # Tail logs (follow mode)
-#   eagle-logs -n 100    # Show last 100 lines and follow
-#   eagle-logs --no-follow -n 50   # Show last 50 lines without following
-#
-# To create an alias, add to ~/.bashrc:
-#   alias eagle-logs='/opt/eagle0/scripts/eagle-logs.sh'
-#
-
-set -euo pipefail
-
-APP_DIR="${APP_DIR:-/opt/eagle0}"
-ACTIVE_FILE="${APP_DIR}/.active-instance"
-
-# Read active instance from file, with fallback
-if [ -f "$ACTIVE_FILE" ]; then
-    ACTIVE=$(cat "$ACTIVE_FILE")
-else
-    # Fallback: check which container is actually running
-    if docker inspect --format='{{.State.Running}}' eagle-blue 2>/dev/null | grep -q true; then
-        ACTIVE="eagle-blue"
-    elif docker inspect --format='{{.State.Running}}' eagle-green 2>/dev/null | grep -q true; then
-        ACTIVE="eagle-green"
-    else
-        ACTIVE=""
-    fi
-fi
-
-if [ -z "$ACTIVE" ]; then
-    echo "Error: No active Eagle instance found" >&2
-    exit 1
-fi
-
-# Default to follow mode if no args provided
-if [ $# -eq 0 ]; then
-    exec docker logs -f "$ACTIVE"
-else
-    exec docker logs "$@" "$ACTIVE"
-fi

scripts/inject_sparkle.sh

@@ -27,59 +27,33 @@ if [ -z "${SPARKLE_EDDSA_PUBLIC_KEY:-}" ]; then
     exit 1
 fi
 
-# Always use a fresh Sparkle download to avoid cache corruption issues
+# Download Sparkle if not cached
 SPARKLE_DIR="$SPARKLE_CACHE_DIR/Sparkle-$SPARKLE_VERSION"
-echo "=== Clearing Sparkle cache and downloading fresh copy ==="
-rm -rf "$SPARKLE_DIR"
-mkdir -p "$SPARKLE_DIR"
-
-SPARKLE_URL="https://github.com/sparkle-project/Sparkle/releases/download/${SPARKLE_VERSION}/Sparkle-${SPARKLE_VERSION}.tar.xz"
-echo "Downloading from: $SPARKLE_URL"
-curl -L "$SPARKLE_URL" -o /tmp/sparkle.tar.xz
-tar -xJf /tmp/sparkle.tar.xz -C "$SPARKLE_DIR"
-rm /tmp/sparkle.tar.xz
-
-# Show what was extracted
-echo "=== Extracted contents ==="
-ls -la "$SPARKLE_DIR/"
-
-# The tarball extracts files directly, not into a subdirectory
-# Verify the framework has proper symlink structure
-echo "=== Verifying Sparkle.framework structure ==="
-ls -la "$SPARKLE_DIR/Sparkle.framework/"
-
-if [ ! -L "$SPARKLE_DIR/Sparkle.framework/Sparkle" ]; then
-    echo "ERROR: Sparkle.framework/Sparkle is not a symlink"
-    file "$SPARKLE_DIR/Sparkle.framework/Sparkle"
-    exit 1
+if [ ! -d "$SPARKLE_DIR/Sparkle.framework" ]; then
+    echo "=== Downloading Sparkle $SPARKLE_VERSION ==="
+    mkdir -p "$SPARKLE_CACHE_DIR"
+    SPARKLE_URL="https://github.com/sparkle-project/Sparkle/releases/download/${SPARKLE_VERSION}/Sparkle-${SPARKLE_VERSION}.tar.xz"
+    curl -L "$SPARKLE_URL" | tar -xJ -C "$SPARKLE_CACHE_DIR"
+    mv "$SPARKLE_CACHE_DIR/Sparkle-$SPARKLE_VERSION" "$SPARKLE_DIR" 2>/dev/null || true
+    # If the extracted directory doesn't match version pattern, it may just be "Sparkle"
+    if [ ! -d "$SPARKLE_DIR" ]; then
+        mkdir -p "$SPARKLE_DIR"
+        mv "$SPARKLE_CACHE_DIR/Sparkle.framework" "$SPARKLE_DIR/" 2>/dev/null || true
+        mv "$SPARKLE_CACHE_DIR/bin" "$SPARKLE_DIR/" 2>/dev/null || true
+    fi
 fi
 
-if [ ! -L "$SPARKLE_DIR/Sparkle.framework/Versions/Current" ]; then
-    echo "ERROR: Sparkle.framework/Versions/Current is not a symlink"
-    ls -la "$SPARKLE_DIR/Sparkle.framework/Versions/"
-    exit 1
-fi
-
-echo "Sparkle framework structure verified OK"
-
 echo "=== Injecting Sparkle framework ==="
 FRAMEWORKS_DIR="$APP_PATH/Contents/Frameworks"
 mkdir -p "$FRAMEWORKS_DIR"
 
-# Remove any existing Sparkle.framework in the app
-rm -rf "$FRAMEWORKS_DIR/Sparkle.framework"
+# Copy Sparkle framework
+cp -R "$SPARKLE_DIR/Sparkle.framework" "$FRAMEWORKS_DIR/"
 
-# Copy Sparkle framework (use ditto to preserve symlinks and bundle structure)
-ditto "$SPARKLE_DIR/Sparkle.framework" "$FRAMEWORKS_DIR/Sparkle.framework"
-
-# Verify the copied framework still has proper structure
-echo "=== Verifying copied Sparkle.framework structure ==="
-ls -la "$FRAMEWORKS_DIR/Sparkle.framework/"
-if [ ! -L "$FRAMEWORKS_DIR/Sparkle.framework/Sparkle" ]; then
-    echo "ERROR: Copied framework lost symlink structure"
-    exit 1
+# Also copy the XPC services if present
+if [ -d "$SPARKLE_DIR/Sparkle.framework/Versions/B/XPCServices" ]; then
+    echo "Sparkle XPC services present"
 fi
-echo "Copied framework structure OK"
 
 echo "=== Updating Info.plist ==="
 PLIST_PATH="$APP_PATH/Contents/Info.plist"
@@ -95,9 +69,8 @@ PLIST_PATH="$APP_PATH/Contents/Info.plist"
 /usr/libexec/PlistBuddy -c "Add :SUEnableAutomaticChecks bool true" "$PLIST_PATH"
 
 # Set bundle version from git for Sparkle version comparison
-# Use commit count for automatic incrementing versions (e.g., 1.0.9548)
+VERSION=$(git describe --tags --always 2>/dev/null || echo "1.0.0")
 BUILD_NUMBER=$(git rev-list --count HEAD 2>/dev/null || echo "1")
-VERSION="1.0.${BUILD_NUMBER}"
 
 echo "Setting version: $VERSION (build $BUILD_NUMBER)"
 /usr/libexec/PlistBuddy -c "Set :CFBundleShortVersionString $VERSION" "$PLIST_PATH" 2>/dev/null || \
@@ -110,7 +83,7 @@ echo "=== Adding URL scheme for invitation codes ==="
 /usr/libexec/PlistBuddy -c "Delete :CFBundleURLTypes" "$PLIST_PATH" 2>/dev/null || true
 /usr/libexec/PlistBuddy -c "Add :CFBundleURLTypes array" "$PLIST_PATH"
 /usr/libexec/PlistBuddy -c "Add :CFBundleURLTypes:0 dict" "$PLIST_PATH"
-/usr/libexec/PlistBuddy -c "Add :CFBundleURLTypes:0:CFBundleURLName string 'net.eagle0.eagle0'" "$PLIST_PATH"
+/usr/libexec/PlistBuddy -c "Add :CFBundleURLTypes:0:CFBundleURLName string 'com.Shardok-Games.eagle0'" "$PLIST_PATH"
 /usr/libexec/PlistBuddy -c "Add :CFBundleURLTypes:0:CFBundleURLSchemes array" "$PLIST_PATH"
 /usr/libexec/PlistBuddy -c "Add :CFBundleURLTypes:0:CFBundleURLSchemes:0 string 'eagle0'" "$PLIST_PATH"
 

scripts/notarize_wait.sh

@@ -50,34 +50,22 @@ if [ "$STATUS" != "Accepted" ]; then
     exit 1
 fi
 
-echo "=== Verifying code signature before stapling ==="
-if ! codesign --verify --deep --strict "$APP_PATH" 2>&1; then
-    echo "ERROR: Code signature verification failed - app may have been damaged during transfer"
-    echo "Attempting to show signature details:"
-    codesign -dvvv "$APP_PATH" 2>&1 || true
-    exit 1
-fi
-echo "Code signature verified successfully"
-
 echo "=== Stapling notarization ticket to app ==="
-# Retry stapling - Apple's CloudKit can take several minutes to propagate the ticket
-MAX_STAPLE_ATTEMPTS=10
-STAPLE_WAIT_SECONDS=30
+# Retry stapling - Apple's CloudKit can have a brief delay after notarization completes
+MAX_STAPLE_ATTEMPTS=5
 STAPLE_ATTEMPT=1
 while [ $STAPLE_ATTEMPT -le $MAX_STAPLE_ATTEMPTS ]; do
     echo "Stapling attempt $STAPLE_ATTEMPT/$MAX_STAPLE_ATTEMPTS..."
-    if STAPLE_OUTPUT=$(xcrun stapler staple "$APP_PATH" 2>&1); then
-        echo "$STAPLE_OUTPUT"
+    if xcrun stapler staple "$APP_PATH"; then
         echo "Stapling successful"
         break
     fi
-    echo "Stapler output: $STAPLE_OUTPUT"
     if [ $STAPLE_ATTEMPT -eq $MAX_STAPLE_ATTEMPTS ]; then
-        echo "ERROR: Stapling failed after $MAX_STAPLE_ATTEMPTS attempts (total wait: $((MAX_STAPLE_ATTEMPTS * STAPLE_WAIT_SECONDS)) seconds)"
+        echo "ERROR: Stapling failed after $MAX_STAPLE_ATTEMPTS attempts"
         exit 1
     fi
-    echo "Stapling failed, waiting $STAPLE_WAIT_SECONDS seconds before retry..."
-    sleep $STAPLE_WAIT_SECONDS
+    echo "Stapling failed, waiting 10 seconds before retry..."
+    sleep 10
     STAPLE_ATTEMPT=$((STAPLE_ATTEMPT + 1))
 done
 

src/main/csharp/net/eagle0/clients/unity/eagle0/.gitignore

@@ -37,7 +37,4 @@ sysinfo.txt
 *.apk
 *.unitypackage
 
-mono_crash.*
-
-# Local server data
-ServerData/
+mono_crash.*

src/main/csharp/net/eagle0/clients/unity/eagle0/Assembly-CSharp.csproj

@@ -26,7 +26,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>Temp\Bin\Debug\Assembly-CSharp\</OutputPath>
-    <DefineConstants>UNITY_6000_3_0;UNITY_6000_3;UNITY_6000;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_4_OR_NEWER;UNITY_2019_1_OR_NEWER;UNITY_2019_2_OR_NEWER;UNITY_2019_3_OR_NEWER;UNITY_2019_4_OR_NEWER;UNITY_2020_1_OR_NEWER;UNITY_2020_2_OR_NEWER;UNITY_2020_3_OR_NEWER;UNITY_2021_1_OR_NEWER;UNITY_2021_2_OR_NEWER;UNITY_2021_3_OR_NEWER;UNITY_2022_1_OR_NEWER;UNITY_2022_2_OR_NEWER;UNITY_2022_3_OR_NEWER;UNITY_2023_1_OR_NEWER;UNITY_2023_2_OR_NEWER;UNITY_2023_3_OR_NEWER;UNITY_6000_0_OR_NEWER;UNITY_6000_1_OR_NEWER;UNITY_6000_2_OR_NEWER;UNITY_6000_3_OR_NEWER;UNITY_INCLUDE_TESTS;UNITY_ANALYTICS;ENABLE_AR;ENABLE_AUDIO;ENABLE_AUDIO_SCRIPTABLE_PIPELINE;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_TEXTURE_STREAMING;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_UNITYWEBREQUEST;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_UNITY_CONSENT;ENABLE_UNITY_CLOUD_IDENTIFIERS;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_EDITOR_GAME_SERVICES;ENABLE_UNITY_GAME_SERVICES_ANALYTICS_SUPPORT;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_GENERATE_NATIVE_PLUGINS_FOR_ASSEMBLIES_API;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;ENABLE_MANAGED_AUDIO_JOBS;ENABLE_ENGINE_CODE_STRIPPING;ENABLE_ONSCREEN_KEYBOARD;ENABLE_MANAGED_UNITYTLS;INCLUDE_DYNAMIC_GI;ENABLE_SCRIPTING_GC_WBARRIERS;PLATFORM_SUPPORTS_MONO;ENABLE_MARSHALLING_TESTS;ENABLE_VIDEO;ENABLE_NAVIGATION_OFFMESHLINK_TO_NAVMESHLINK;ENABLE_ACCELERATOR_CLIENT_DEBUGGING;ENABLE_ACCESSIBILITY_SCREEN_READER;ENABLE_ACCESSIBILITY_SETTINGS;TEXTCORE_1_0_OR_NEWER;EDITOR_ONLY_NAVMESH_BUILDER_DEPRECATED;ENABLE_RUNTIME_GI;ENABLE_GAMECENTER;ENABLE_NETWORK;ENABLE_IOS_ON_DEMAND_RESOURCES;ENABLE_IOS_APP_SLICING;PLAYERCONNECTION_LISTENS_FIXED_PORT;DEBUGGER_LISTENS_FIXED_PORT;PLATFORM_SUPPORTS_ADS_ID;PLATFORM_SUPPORTS_INSIGHTS_IDFA;PLATFORM_SUPPORTS_INSIGHTS_DEVICE_INFO;SUPPORT_ENVIRONMENT_VARIABLES;PLATFORM_SUPPORTS_PROFILER;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_ETC_COMPRESSION;UNITY_IPHONE_API;PLATFORM_SUPPORTS_SPLIT_GRAPHICS_JOBS;ENABLE_INSIGHTS_PLATFORM_SPECIFIC_RESOURCES;ENABLE_UNITYADS_RUNTIME;UNITY_UNITYADS_API;PLATFORM_IOS;UNITY_IOS;PLATFORM_IPHONE;UNITY_IPHONE;UNITY_HAS_GOOGLEVR;ENABLE_SPATIALTRACKING;ENABLE_CLOUD_SERVICES_ENGINE_DIAGNOSTICS;ENABLE_FIREBASE_IDENTIFIERS;ENABLE_MONO;NET_4_6;NET_UNITY_4_8;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_OSX;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_DIRECTOR;ENABLE_LOCALIZATION;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_TILEMAP;ENABLE_TIMELINE;ENABLE_LEGACY_INPUT_MANAGER;TEXTCORE_FONT_ENGINE_1_5_OR_NEWER;TEXTCORE_TEXT_ENGINE_1_5_OR_NEWER;TEXTCORE_FONT_ENGINE_1_6_OR_NEWER;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER</DefineConstants>
+    <DefineConstants>UNITY_6000_3_0;UNITY_6000_3;UNITY_6000;UNITY_5_3_OR_NEWER;UNITY_5_4_OR_NEWER;UNITY_5_5_OR_NEWER;UNITY_5_6_OR_NEWER;UNITY_2017_1_OR_NEWER;UNITY_2017_2_OR_NEWER;UNITY_2017_3_OR_NEWER;UNITY_2017_4_OR_NEWER;UNITY_2018_1_OR_NEWER;UNITY_2018_2_OR_NEWER;UNITY_2018_3_OR_NEWER;UNITY_2018_4_OR_NEWER;UNITY_2019_1_OR_NEWER;UNITY_2019_2_OR_NEWER;UNITY_2019_3_OR_NEWER;UNITY_2019_4_OR_NEWER;UNITY_2020_1_OR_NEWER;UNITY_2020_2_OR_NEWER;UNITY_2020_3_OR_NEWER;UNITY_2021_1_OR_NEWER;UNITY_2021_2_OR_NEWER;UNITY_2021_3_OR_NEWER;UNITY_2022_1_OR_NEWER;UNITY_2022_2_OR_NEWER;UNITY_2022_3_OR_NEWER;UNITY_2023_1_OR_NEWER;UNITY_2023_2_OR_NEWER;UNITY_2023_3_OR_NEWER;UNITY_6000_0_OR_NEWER;UNITY_6000_1_OR_NEWER;UNITY_6000_2_OR_NEWER;UNITY_6000_3_OR_NEWER;PLATFORM_ARCH_64;UNITY_64;UNITY_INCLUDE_TESTS;UNITY_ANALYTICS;ENABLE_AR;ENABLE_AUDIO;ENABLE_AUDIO_SCRIPTABLE_PIPELINE;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_TEXTURE_STREAMING;ENABLE_VIRTUALTEXTURING;ENABLE_LZMA;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_UNITYWEBREQUEST;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ADS;ENABLE_CLOUD_SERVICES_USE_WEBREQUEST;ENABLE_UNITY_CONSENT;ENABLE_UNITY_CLOUD_IDENTIFIERS;ENABLE_CLOUD_SERVICES_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_NATIVE_CRASH_REPORTING;ENABLE_CLOUD_SERVICES_PURCHASING;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_BUILD;ENABLE_EDITOR_GAME_SERVICES;ENABLE_UNITY_GAME_SERVICES_ANALYTICS_SUPPORT;ENABLE_CLOUD_LICENSE;ENABLE_EDITOR_HUB_LICENSE;ENABLE_WEBSOCKET_CLIENT;ENABLE_GENERATE_NATIVE_PLUGINS_FOR_ASSEMBLIES_API;ENABLE_DIRECTOR_AUDIO;ENABLE_DIRECTOR_TEXTURE;ENABLE_MANAGED_JOBS;ENABLE_MANAGED_TRANSFORM_JOBS;ENABLE_MANAGED_ANIMATION_JOBS;ENABLE_MANAGED_AUDIO_JOBS;ENABLE_MANAGED_UNITYTLS;INCLUDE_DYNAMIC_GI;ENABLE_SCRIPTING_GC_WBARRIERS;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_MARSHALLING_TESTS;ENABLE_VIDEO;ENABLE_NAVIGATION_OFFMESHLINK_TO_NAVMESHLINK;ENABLE_ACCELERATOR_CLIENT_DEBUGGING;ENABLE_ACCESSIBILITY_SCREEN_READER;TEXTCORE_1_0_OR_NEWER;EDITOR_ONLY_NAVMESH_BUILDER_DEPRECATED;PLATFORM_STANDALONE_OSX;PLATFORM_STANDALONE;UNITY_STANDALONE_OSX;UNITY_STANDALONE;ENABLE_GAMECENTER;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_CLOUD_SERVICES_ENGINE_DIAGNOSTICS;ENABLE_CLUSTER_SYNC;ENABLE_CLUSTERINPUT;ENABLE_SPATIALTRACKING;PLATFORM_HAS_CUSTOM_MUTEX;PLATFORM_UPDATES_TIME_OUTSIDE_OF_PLAYER_LOOP;PLATFORM_SUPPORTS_SPLIT_GRAPHICS_JOBS;ENABLE_MONO;NET_STANDARD_2_0;NET_STANDARD;NET_STANDARD_2_1;NETSTANDARD;NETSTANDARD2_1;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_OSX;ENABLE_UNITY_COLLECTIONS_CHECKS;ENABLE_BURST_AOT;UNITY_TEAM_LICENSE;ENABLE_CUSTOM_RENDER_TEXTURE;ENABLE_DIRECTOR;ENABLE_LOCALIZATION;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_TILEMAP;ENABLE_TIMELINE;ENABLE_LEGACY_INPUT_MANAGER;TEXTCORE_FONT_ENGINE_1_5_OR_NEWER;TEXTCORE_TEXT_ENGINE_1_5_OR_NEWER;TEXTCORE_FONT_ENGINE_1_6_OR_NEWER;CSHARP_7_OR_LATER;CSHARP_7_3_OR_NEWER</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <NoWarn>0169,0649</NoWarn>
@@ -87,6 +87,7 @@
     <Compile Include="Assets/Modern UI Pack/Scripts/Demo/LaunchURL.cs" />
     <Compile Include="Assets/Shardok/HexCoordinates.cs" />
     <Compile Include="Assets/Eagle/Table Rows/OrganizeTroopsTableRow.cs" />
+    <Compile Include="Assets/Bluetooth/PickerRowController.cs" />
     <Compile Include="Assets/TouchHandler.cs" />
     <Compile Include="Assets/Eagle/CommandSelectors/TravelCommandSelector.cs" />
     <Compile Include="Assets/Eagle/ConnectionStatusUI.cs" />
@@ -97,6 +98,7 @@
     <Compile Include="Assets/HoveringTooltipTextProvider.cs" />
     <Compile Include="Assets/Eagle/CommandSelectors/util/KeyModifiedAmount.cs" />
     <Compile Include="Assets/HoveringTooltip.cs" />
+    <Compile Include="Assets/Bluetooth/DiceInterface.cs" />
     <Compile Include="Assets/ButtonColors.cs" />
     <Compile Include="Assets/Eagle/MapController.cs" />
     <Compile Include="Assets/common/DisclosureTriangle.cs" />
@@ -146,12 +148,13 @@
     <Compile Include="Assets/Modern UI Pack/Scripts/Slider/RadialSlider.cs" />
     <Compile Include="Assets/Eagle/Notifications/WeatherForcedTurnBackNotificationGenerator.cs" />
     <Compile Include="Assets/Modern UI Pack/Scripts/Button/ButtonManager.cs" />
-    <Compile Include="Assets/common/GUIUtils/TouchAwareTooltip.cs" />
     <Compile Include="Assets/Eagle/GeneratedTextUpdater.cs" />
     <Compile Include="Assets/Eagle/Notifications/ARNNotifications/OutlawApprehendedDetailsNotificationGenerator.cs" />
     <Compile Include="Assets/Shardok/HexMetrics.cs" />
+    <Compile Include="Assets/Bluetooth/OneDiceRollController.cs" />
     <Compile Include="Assets/Modern UI Pack/Scripts/Switch/SwitchManager.cs" />
     <Compile Include="Assets/Eagle/Notifications/ARNNotifications/ProvinceHeldDetailsNotificationGenerator.cs" />
+    <Compile Include="Assets/Bluetooth/DieInfo.cs" />
     <Compile Include="Assets/common/ResourceFetcher.cs" />
     <Compile Include="Assets/Tutorial/Content/TutorialStep.cs" />
     <Compile Include="Assets/Auth/AuthClient.cs" />
@@ -159,11 +162,12 @@
     <Compile Include="Assets/Eagle/Notifications/RiotSuppressedNotificationGenerator.cs" />
     <Compile Include="Assets/Modern UI Pack/Scripts/Modal Window/ModalWindowManagerEditor.cs" />
     <Compile Include="Assets/common/GUIUtils/AutoScrollingText.cs" />
+    <Compile Include="Assets/Bluetooth/NativeDiceInterfaceImports.cs" />
     <Compile Include="Assets/Eagle/Notifications/ProvinceConqueredNotificationGenerator.cs" />
     <Compile Include="Assets/Eagle/Table Rows/ExtraTroopsRowController.cs" />
     <Compile Include="Assets/Auth/JwtAuthInterceptor.cs" />
-    <Compile Include="Assets/Tutorial/Content/TutorialContentDefinitions.cs" />
     <Compile Include="Assets/Eagle/CommandPanelController.cs" />
+    <Compile Include="Assets/Tutorial/Content/TutorialContentDefinitions.cs" />
     <Compile Include="Assets/Eagle/Notifications/ARNNotifications/ShatteredArmyDetailsNotificationGenerator.cs" />
     <Compile Include="Assets/Shardok/TurnHistoryPanelController.cs" />
     <Compile Include="Assets/Eagle/Notifications/ARNNotifications/HeroDepartureDetailsNotificationGenerator.cs" />
@@ -175,9 +179,9 @@
     <Compile Include="Assets/Shardok/BattalionTypeManager.cs" />
     <Compile Include="Assets/Eagle/CommandSelectors/DefendCommandSelector.cs" />
     <Compile Include="Assets/Eagle/HeroesAndBattalionsPanelController.cs" />
+    <Compile Include="Assets/common/HexMapStorage.cs" />
     <Compile Include="Assets/Modern UI Pack/Scripts/Button/ButtonManagerBasic.cs" />
     <Compile Include="Assets/Eagle/Notifications/ARNNotifications/BreakAllianceAmbassadorImprisonedNotificationGenerator.cs" />
-    <Compile Include="Assets/common/HexMapStorage.cs" />
     <Compile Include="Assets/Eagle/CommandSelectors/PleaseRecruitMeCommandSelector.cs" />
     <Compile Include="Assets/Eagle/Notifications/RiotAvertedNotificationGenerator.cs" />
     <Compile Include="Assets/Modern UI Pack/Scripts/Notification/NotificationStacking.cs" />
@@ -208,7 +212,7 @@
     <Compile Include="Assets/Eagle/CommandSelectors/ExileVassalCommandSelector.cs" />
     <Compile Include="Assets/Tutorial/TutorialState.cs" />
     <Compile Include="Assets/Modern UI Pack/Scripts/Button/ButtonManagerBasicWithIconEditor.cs" />
-    <Compile Include="Assets/Shardok/WeatherEffectAnimator.cs" />
+    <Compile Include="Assets/Bluetooth/DiceVectors.cs" />
     <Compile Include="Assets/Modern UI Pack/Scripts/UI Manager/UIManagerProgressBarLoop.cs" />
     <Compile Include="Assets/Eagle/MovingArmiesTableController.cs" />
     <Compile Include="Assets/ConnectionHandler/ConnectionHandler.cs" />
@@ -229,11 +233,9 @@
     <Compile Include="Assets/Eagle/CommandSelectors/DiplomacyCommandSelector.cs" />
     <Compile Include="Assets/Tutorial/Triggers/TutorialTriggerRegistry.cs" />
     <Compile Include="Assets/Eagle/CommandSelectors/ResolveBreakAllianceCommandSelector.cs" />
-    <Compile Include="Assets/common/WindowFocusManager.cs" />
     <Compile Include="Assets/Eagle/CommandSelectors/ResolveAllianceCommandSelector.cs" />
     <Compile Include="Assets/Eagle/Notifications/ARNNotifications/WithdrewForTruceDetailsNotificationGenerator.cs" />
     <Compile Include="Assets/Eagle/CommandSelectors/MarchCommandSelector.cs" />
-    <Compile Include="Assets/Tutorial/TutorialTargetRegistry.cs" />
     <Compile Include="Assets/Eagle/CommandSelectors/TrainCommandSelector.cs" />
     <Compile Include="Assets/Eagle/CustomFileLogger.cs" />
     <Compile Include="Assets/Eagle/Notifications/ARNNotifications/InvitationAcceptedDetailsNotificationGenerator.cs" />
@@ -267,6 +269,7 @@
     <Compile Include="Assets/Shardok/AnimationTestController.cs" />
     <Compile Include="Assets/Eagle/CommandSelectors/TradeCommandSelector.cs" />
     <Compile Include="Assets/Eagle/Table Rows/DominionTableRowController.cs" />
+    <Compile Include="Assets/Bluetooth/RollPanelController.cs" />
     <Compile Include="Assets/Shardok/ChargeAnimator.cs" />
     <Compile Include="Assets/Eagle/ClientTextProvider.cs" />
     <Compile Include="Assets/Modern UI Pack/Scripts/UI Manager/UIManager.cs" />
@@ -278,6 +281,7 @@
     <Compile Include="Assets/Shardok/MeteorAnimator.cs" />
     <Compile Include="Assets/Eagle/CommandSelectors/ReturnCommandSelector.cs" />
     <Compile Include="Assets/Eagle/CommandSelectors/ResolveTruceCommandSelector.cs" />
+    <Compile Include="Assets/Eagle/ClientPregeneratedText.cs" />
     <Compile Include="Assets/Eagle/CommandSelectors/SwearBrotherhoodCommandSelector.cs" />
     <Compile Include="Assets/Auth/TokenStorage.cs" />
     <Compile Include="Assets/Eagle/Table Rows/TableRowController.cs" />
@@ -295,13 +299,11 @@
     <Compile Include="Assets/Modern UI Pack/Scripts/Button/ButtonManagerEditor.cs" />
     <Compile Include="Assets/UI/Scripts/SceneMigrationHelper.cs" />
     <Compile Include="Assets/Eagle/Table Rows/UnitSelectorHeroRowController.cs" />
-    <Compile Include="Assets/Shardok/BridgeRotationCalculator.cs" />
     <Compile Include="Assets/ConnectionHandler/CustomBattleHandler.cs" />
     <Compile Include="Assets/Eagle/Notifications/ARNNotifications/RansomPaidDetailsNotificationGenerator.cs" />
     <Compile Include="Assets/Shardok/ControlAnimator.cs" />
     <Compile Include="Assets/Modern UI Pack/Scripts/Horizontal Selector/HorizontalSelector.cs" />
     <Compile Include="Assets/Eagle/Table Rows/OrganizeTroopsResultRow.cs" />
-    <Compile Include="Assets/Eagle/SparkleUpdater.cs" />
     <Compile Include="Assets/Modern UI Pack/Scripts/Slider/SliderManagerEditor.cs" />
     <Compile Include="Assets/Eagle/Notifications/ARNNotifications/SwearBrotherhoodDetailsNotificationGenerator.cs" />
     <Compile Include="Assets/Eagle/PersistentClientConnection.cs" />
@@ -310,7 +312,6 @@
     <Compile Include="Assets/Eagle/CommandSelectors/RecruitHeroesCommandSelector.cs" />
     <Compile Include="Assets/Shardok/CommandTypeUIManager.cs" />
     <Compile Include="Assets/Eagle/Notifications/ARNNotifications/PrisonerReleasedDetailsNotificationGenerator.cs" />
-    <Compile Include="Assets/common/SingleInstanceEnforcer.cs" />
     <Compile Include="Assets/common/GUIUtils/TableRowClickDetector.cs" />
     <Compile Include="Assets/PlayerColors.cs" />
     <Compile Include="Assets/Eagle/Notifications/ARNNotifications/CapturedHeroReturnedDetailsNotificationGenerator.cs" />
@@ -321,15 +322,14 @@
     <Compile Include="Assets/Shardok/ShardokGameModel.cs" />
     <Compile Include="Assets/common/GUIUtils/GeneralClickDetector.cs" />
     <Compile Include="Assets/Modern UI Pack/Scripts/UI Manager/UIManagerContextMenu.cs" />
-    <Compile Include="Assets/Eagle/SparkleInitializer.cs" />
     <Compile Include="Assets/Eagle/Notifications/ARNNotifications/TruceAmbassadorImprisonedDetailsNotificationGenerator.cs" />
     <Compile Include="Assets/Modern UI Pack/Scripts/Button/ButtonManagerBasicWithIcon.cs" />
     <Compile Include="Assets/Tutorial/UI/TutorialHintIndicator.cs" />
+    <Compile Include="Assets/Bluetooth/UnityDieColors.cs" />
     <Compile Include="Assets/Eagle/CommandSelectors/OrganizeTroopsCommandSelector.cs" />
     <Compile Include="Assets/Shardok/ExtinguishAnimator.cs" />
     <Compile Include="Assets/Eagle/PanelPositions.cs" />
     <Compile Include="Assets/Eagle/Notifications/NotificationGenerator.cs" />
-    <Compile Include="Assets/BuildInfo.cs" />
     <Compile Include="Assets/Eagle/Notifications/DynamicTextNotification.cs" />
     <Compile Include="Assets/Modern UI Pack/Scripts/UI Manager/UIManagerToggle.cs" />
     <Compile Include="Assets/Modern UI Pack/Scripts/UI Manager/UIManagerAnimatedIcon.cs" />
@@ -338,6 +338,7 @@
     <Compile Include="Assets/EagleConnection.cs" />
     <Compile Include="Assets/GUI Pro Kit Fantasy RPG/Scripts/CtrPanel.cs" />
     <Compile Include="Assets/UI/Scripts/SceneLoadTester.cs" />
+    <Compile Include="Assets/Bluetooth/RollFetcher.cs" />
     <Compile Include="Assets/Eagle/CommandSelectors/HandleRiotGiveCommandSelector.cs" />
     <Compile Include="Assets/Eagle/ProvinceUtils.cs" />
     <Compile Include="Assets/common/GUIUtils/ProvinceStatUtils.cs" />
@@ -371,15 +372,16 @@
     <Compile Include="Assets/Eagle/Notifications/ARNNotifications/SuppressBeastsFailedDetailsNotificationGenerator.cs" />
     <Compile Include="Assets/Terrain Hexes/Example Scene/BasicHexArranger.cs" />
     <Compile Include="Assets/Eagle/CommandSelectors/ManagePrisonersCommandSelector.cs" />
-    <Compile Include="Assets/ConnectionHandler/StoredAccountButton.cs" />
-    <Compile Include="Assets/Tutorial/UI/TutorialUIManager.cs" />
     <Compile Include="Assets/Eagle/CommandSelectors/SendSuppliesCommandSelector.cs" />
+    <Compile Include="Assets/Tutorial/UI/TutorialUIManager.cs" />
     <Compile Include="Assets/Modern UI Pack/Scripts/Window/WindowManager.cs" />
+    <Compile Include="Assets/Auth/InvitationCodeManager.cs" />
     <Compile Include="Assets/Eagle/Notifications/ARNNotifications/CapturedHeroExiledDetailsNotificationGenerator.cs" />
     <Compile Include="Assets/Eagle/Notifications/ARNNotifications/SuppressBeastsSucceededNotificationGenerator.cs" />
     <Compile Include="Assets/Shardok/ReservesTableController.cs" />
     <Compile Include="Assets/Eagle/CommandSelectors/CommandSelector.cs" />
     <Compile Include="Assets/Eagle/CommandSelectors/RestCommandSelector.cs" />
+    <Compile Include="Assets/Bluetooth/DiceConfigurationPanelController.cs" />
     <Compile Include="Assets/Modern UI Pack/Scripts/UI Manager/UIManagerDropdown.cs" />
     <Compile Include="Assets/Modern UI Pack/Scripts/UI Manager/UIManagerButton.cs" />
     <Compile Include="Assets/common/GUIUtils/GUIUtils.cs" />
@@ -415,12 +417,10 @@
     <None Include="Assets/Packages/Microsoft.Extensions.Options.8.0.0/lib/netstandard2.1/Microsoft.Extensions.Options.xml" />
     <None Include="Assets/TextMesh Pro/Shaders/TMPro_Mobile.cginc" />
     <None Include="Assets/TextMesh Pro/Shaders/TMP_SDF SSD.shader" />
-    <None Include="Assets/TextMesh Pro/Shaders/TMPro_Properties.cginc" />
     <None Include="Assets/Shardok/Painted Medieval Fantasy Items 1/medieval_items1.txt" />
     <None Include="Assets/TextMesh Pro/Resources/Shaders/TMP_SDF-Surface-Mobile.shader" />
     <None Include="Assets/Eagle/maskShader.shader" />
     <None Include="Assets/GUI Pro Kit Fantasy RPG/Extensions/UIParticle/hidden particle.shader" />
-    <None Include="Assets/TextMesh Pro/Shaders/TMPro.cginc" />
     <None Include="Assets/Terrain Hexes/readme.txt" />
     <None Include="Assets/Modern UI Pack/Read Me.txt" />
     <None Include="Assets/TextMesh Pro/Shaders/SDFFunctions.hlsl" />
@@ -450,7 +450,7 @@
     <None Include="Assets/Packages/System.ComponentModel.Annotations.5.0.0/useSharedDesignerContext.txt" />
     <None Include="Assets/Packages/System.Runtime.CompilerServices.Unsafe.6.0.0/useSharedDesignerContext.txt" />
     <None Include="Assets/TextMesh Pro/Resources/Shaders/TMP_SDF-Mobile Masking.shader" />
-    <None Include="Assets/Music/Music Credits.txt" />
+    <None Include="Assets/Resources/Music/Music Credits.txt" />
     <None Include="Assets/Packages/System.Diagnostics.DiagnosticSource.8.0.0/useSharedDesignerContext.txt" />
     <None Include="Assets/Packages/Microsoft.Extensions.Logging.8.0.0/useSharedDesignerContext.txt" />
     <None Include="Assets/Packages/Microsoft.Extensions.DependencyInjection.Abstractions.8.0.0/useSharedDesignerContext.txt" />
@@ -496,6 +496,12 @@
     <Reference Include="UnityEngine.ClothModule">
       <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/Managed/UnityEngine/UnityEngine.ClothModule.dll</HintPath>
     </Reference>
+    <Reference Include="UnityEngine.ClusterInputModule">
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/Managed/UnityEngine/UnityEngine.ClusterInputModule.dll</HintPath>
+    </Reference>
+    <Reference Include="UnityEngine.ClusterRendererModule">
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/Managed/UnityEngine/UnityEngine.ClusterRendererModule.dll</HintPath>
+    </Reference>
     <Reference Include="UnityEngine.ContentLoadModule">
       <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/Managed/UnityEngine/UnityEngine.ContentLoadModule.dll</HintPath>
     </Reference>
@@ -688,6 +694,9 @@
     <Reference Include="UnityEngine.VideoModule">
       <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/Managed/UnityEngine/UnityEngine.VideoModule.dll</HintPath>
     </Reference>
+    <Reference Include="UnityEngine.VirtualTexturingModule">
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/Managed/UnityEngine/UnityEngine.VirtualTexturingModule.dll</HintPath>
+    </Reference>
     <Reference Include="UnityEngine.WindModule">
       <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/Managed/UnityEngine/UnityEngine.WindModule.dll</HintPath>
     </Reference>
@@ -862,6 +871,9 @@
     <Reference Include="Microsoft.Extensions.Logging.Abstractions">
       <HintPath>/Users/dancrosby/CodingProjects/github/eagle0-unity-client/src/main/csharp/net/eagle0/clients/unity/eagle0/Assets/Packages/Microsoft.Extensions.Logging.Abstractions.8.0.0/lib/netstandard2.0/Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
     </Reference>
+    <Reference Include="System.ComponentModel.Annotations">
+      <HintPath>/Users/dancrosby/CodingProjects/github/eagle0-unity-client/src/main/csharp/net/eagle0/clients/unity/eagle0/Assets/Packages/System.ComponentModel.Annotations.5.0.0/lib/netstandard2.1/System.ComponentModel.Annotations.dll</HintPath>
+    </Reference>
     <Reference Include="nunit.framework">
       <HintPath>/Users/dancrosby/CodingProjects/github/eagle0-unity-client/src/main/csharp/net/eagle0/clients/unity/eagle0/Library/PackageCache/com.unity.ext.nunit@d8c07649098d/net40/unity-custom/nunit.framework.dll</HintPath>
     </Reference>
@@ -916,392 +928,374 @@
     <Reference Include="Unity.Analytics.StandardEvents">
       <HintPath>/Users/dancrosby/CodingProjects/github/eagle0-unity-client/src/main/csharp/net/eagle0/clients/unity/eagle0/Library/PackageCache/com.unity.analytics@c9d14a6bdec6/AnalyticsStandardEvents/Unity.Analytics.StandardEvents.dll</HintPath>
     </Reference>
-    <Reference Include="UnityEditor.iOS.Extensions.Xcode">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.Xcode.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEditor.iOS.Extensions.Common">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.Common.dll</HintPath>
-    </Reference>
-    <Reference Include="UnityEditor.Apple.Extensions.Common">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/PlaybackEngines/iOSSupport/UnityEditor.Apple.Extensions.Common.dll</HintPath>
-    </Reference>
     <Reference Include="UnityEditor.iOS.Extensions.Xcode">
       <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/PlaybackEngines/MacStandaloneSupport/UnityEditor.iOS.Extensions.Xcode.dll</HintPath>
     </Reference>
-    <Reference Include="mscorlib">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/mscorlib.dll</HintPath>
-    </Reference>
-    <Reference Include="System">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/System.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Core">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/System.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Runtime.Serialization">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/System.Runtime.Serialization.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Xml">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/System.Xml.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Xml.Linq">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/System.Xml.Linq.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Numerics">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/System.Numerics.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Numerics.Vectors">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/System.Numerics.Vectors.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Net.Http">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/System.Net.Http.dll</HintPath>
-    </Reference>
-    <Reference Include="System.IO.Compression">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/System.IO.Compression.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.CSharp">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Microsoft.CSharp.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Data">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/System.Data.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Data.DataSetExtensions">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/System.Data.DataSetExtensions.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Drawing">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/System.Drawing.dll</HintPath>
-    </Reference>
-    <Reference Include="System.IO.Compression.FileSystem">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/System.IO.Compression.FileSystem.dll</HintPath>
-    </Reference>
-    <Reference Include="System.ComponentModel.Composition">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/System.ComponentModel.Composition.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Transactions">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/System.Transactions.dll</HintPath>
+    <Reference Include="netstandard">
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/ref/2.1.0/netstandard.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Win32.Primitives">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/Microsoft.Win32.Primitives.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/Microsoft.Win32.Primitives.dll</HintPath>
     </Reference>
     <Reference Include="System.AppContext">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.AppContext.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.AppContext.dll</HintPath>
     </Reference>
     <Reference Include="System.Buffers">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Buffers.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Buffers.dll</HintPath>
     </Reference>
     <Reference Include="System.Collections.Concurrent">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Collections.Concurrent.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Collections.Concurrent.dll</HintPath>
     </Reference>
     <Reference Include="System.Collections.NonGeneric">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Collections.NonGeneric.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Collections.NonGeneric.dll</HintPath>
     </Reference>
     <Reference Include="System.Collections.Specialized">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Collections.Specialized.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Collections.Specialized.dll</HintPath>
     </Reference>
     <Reference Include="System.Collections">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Collections.dll</HintPath>
-    </Reference>
-    <Reference Include="System.ComponentModel.Annotations">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.ComponentModel.Annotations.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Collections.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.EventBasedAsync">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.ComponentModel.EventBasedAsync.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.ComponentModel.EventBasedAsync.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.Primitives">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.ComponentModel.Primitives.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.ComponentModel.Primitives.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.TypeConverter">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.ComponentModel.TypeConverter.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.ComponentModel.TypeConverter.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.ComponentModel.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.ComponentModel.dll</HintPath>
     </Reference>
     <Reference Include="System.Console">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Console.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Console.dll</HintPath>
     </Reference>
     <Reference Include="System.Data.Common">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Data.Common.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Data.Common.dll</HintPath>
     </Reference>
     <Reference Include="System.Diagnostics.Contracts">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Diagnostics.Contracts.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Diagnostics.Contracts.dll</HintPath>
     </Reference>
     <Reference Include="System.Diagnostics.Debug">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Diagnostics.Debug.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Diagnostics.Debug.dll</HintPath>
     </Reference>
     <Reference Include="System.Diagnostics.FileVersionInfo">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Diagnostics.FileVersionInfo.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Diagnostics.FileVersionInfo.dll</HintPath>
     </Reference>
     <Reference Include="System.Diagnostics.Process">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Diagnostics.Process.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Diagnostics.Process.dll</HintPath>
     </Reference>
     <Reference Include="System.Diagnostics.StackTrace">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Diagnostics.StackTrace.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Diagnostics.StackTrace.dll</HintPath>
     </Reference>
     <Reference Include="System.Diagnostics.TextWriterTraceListener">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Diagnostics.TextWriterTraceListener.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Diagnostics.TextWriterTraceListener.dll</HintPath>
     </Reference>
     <Reference Include="System.Diagnostics.Tools">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Diagnostics.Tools.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Diagnostics.Tools.dll</HintPath>
     </Reference>
     <Reference Include="System.Diagnostics.TraceSource">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Diagnostics.TraceSource.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Diagnostics.TraceSource.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Diagnostics.Tracing">
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Diagnostics.Tracing.dll</HintPath>
     </Reference>
     <Reference Include="System.Drawing.Primitives">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Drawing.Primitives.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Drawing.Primitives.dll</HintPath>
     </Reference>
     <Reference Include="System.Dynamic.Runtime">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Dynamic.Runtime.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Dynamic.Runtime.dll</HintPath>
     </Reference>
     <Reference Include="System.Globalization.Calendars">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Globalization.Calendars.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Globalization.Calendars.dll</HintPath>
     </Reference>
     <Reference Include="System.Globalization.Extensions">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Globalization.Extensions.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Globalization.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="System.Globalization">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Globalization.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Globalization.dll</HintPath>
     </Reference>
     <Reference Include="System.IO.Compression.ZipFile">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.IO.Compression.ZipFile.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.IO.Compression.ZipFile.dll</HintPath>
+    </Reference>
+    <Reference Include="System.IO.Compression">
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.IO.Compression.dll</HintPath>
     </Reference>
     <Reference Include="System.IO.FileSystem.DriveInfo">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.IO.FileSystem.DriveInfo.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.IO.FileSystem.DriveInfo.dll</HintPath>
     </Reference>
     <Reference Include="System.IO.FileSystem.Primitives">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.IO.FileSystem.Primitives.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.IO.FileSystem.Primitives.dll</HintPath>
     </Reference>
     <Reference Include="System.IO.FileSystem.Watcher">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.IO.FileSystem.Watcher.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.IO.FileSystem.Watcher.dll</HintPath>
     </Reference>
     <Reference Include="System.IO.FileSystem">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.IO.FileSystem.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.IO.FileSystem.dll</HintPath>
     </Reference>
     <Reference Include="System.IO.IsolatedStorage">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.IO.IsolatedStorage.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.IO.IsolatedStorage.dll</HintPath>
     </Reference>
     <Reference Include="System.IO.MemoryMappedFiles">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.IO.MemoryMappedFiles.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.IO.MemoryMappedFiles.dll</HintPath>
     </Reference>
     <Reference Include="System.IO.Pipes">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.IO.Pipes.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.IO.Pipes.dll</HintPath>
     </Reference>
     <Reference Include="System.IO.UnmanagedMemoryStream">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.IO.UnmanagedMemoryStream.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.IO.UnmanagedMemoryStream.dll</HintPath>
     </Reference>
     <Reference Include="System.IO">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.IO.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.IO.dll</HintPath>
     </Reference>
     <Reference Include="System.Linq.Expressions">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Linq.Expressions.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Linq.Expressions.dll</HintPath>
     </Reference>
     <Reference Include="System.Linq.Parallel">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Linq.Parallel.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Linq.Parallel.dll</HintPath>
     </Reference>
     <Reference Include="System.Linq.Queryable">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Linq.Queryable.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Linq.Queryable.dll</HintPath>
     </Reference>
     <Reference Include="System.Linq">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Linq.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Linq.dll</HintPath>
     </Reference>
     <Reference Include="System.Memory">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Memory.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Memory.dll</HintPath>
     </Reference>
-    <Reference Include="System.Net.Http.Rtc">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Net.Http.Rtc.dll</HintPath>
+    <Reference Include="System.Net.Http">
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Net.Http.dll</HintPath>
     </Reference>
     <Reference Include="System.Net.NameResolution">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Net.NameResolution.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Net.NameResolution.dll</HintPath>
     </Reference>
     <Reference Include="System.Net.NetworkInformation">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Net.NetworkInformation.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Net.NetworkInformation.dll</HintPath>
     </Reference>
     <Reference Include="System.Net.Ping">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Net.Ping.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Net.Ping.dll</HintPath>
     </Reference>
     <Reference Include="System.Net.Primitives">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Net.Primitives.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Net.Primitives.dll</HintPath>
     </Reference>
     <Reference Include="System.Net.Requests">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Net.Requests.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Net.Requests.dll</HintPath>
     </Reference>
     <Reference Include="System.Net.Security">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Net.Security.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Net.Security.dll</HintPath>
     </Reference>
     <Reference Include="System.Net.Sockets">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Net.Sockets.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Net.Sockets.dll</HintPath>
     </Reference>
     <Reference Include="System.Net.WebHeaderCollection">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Net.WebHeaderCollection.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Net.WebHeaderCollection.dll</HintPath>
     </Reference>
     <Reference Include="System.Net.WebSockets.Client">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Net.WebSockets.Client.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Net.WebSockets.Client.dll</HintPath>
     </Reference>
     <Reference Include="System.Net.WebSockets">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Net.WebSockets.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Net.WebSockets.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Numerics.Vectors">
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Numerics.Vectors.dll</HintPath>
     </Reference>
     <Reference Include="System.ObjectModel">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.ObjectModel.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.ObjectModel.dll</HintPath>
     </Reference>
     <Reference Include="System.Reflection.DispatchProxy">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Reflection.DispatchProxy.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Reflection.DispatchProxy.dll</HintPath>
     </Reference>
     <Reference Include="System.Reflection.Emit.ILGeneration">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Reflection.Emit.ILGeneration.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Reflection.Emit.ILGeneration.dll</HintPath>
     </Reference>
     <Reference Include="System.Reflection.Emit.Lightweight">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Reflection.Emit.Lightweight.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Reflection.Emit.Lightweight.dll</HintPath>
     </Reference>
     <Reference Include="System.Reflection.Emit">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Reflection.Emit.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Reflection.Emit.dll</HintPath>
     </Reference>
     <Reference Include="System.Reflection.Extensions">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Reflection.Extensions.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Reflection.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="System.Reflection.Primitives">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Reflection.Primitives.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Reflection.Primitives.dll</HintPath>
     </Reference>
     <Reference Include="System.Reflection">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Reflection.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Reflection.dll</HintPath>
     </Reference>
     <Reference Include="System.Resources.Reader">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Resources.Reader.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Resources.Reader.dll</HintPath>
     </Reference>
     <Reference Include="System.Resources.ResourceManager">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Resources.ResourceManager.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Resources.ResourceManager.dll</HintPath>
     </Reference>
     <Reference Include="System.Resources.Writer">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Resources.Writer.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Resources.Writer.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.CompilerServices.VisualC">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Runtime.CompilerServices.VisualC.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Runtime.CompilerServices.VisualC.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.Extensions">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Runtime.Extensions.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Runtime.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.Handles">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Runtime.Handles.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Runtime.Handles.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.InteropServices.RuntimeInformation">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Runtime.InteropServices.WindowsRuntime">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Runtime.InteropServices.WindowsRuntime.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.InteropServices">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Runtime.InteropServices.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Runtime.InteropServices.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.Numerics">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Runtime.Numerics.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Runtime.Numerics.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.Serialization.Formatters">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Runtime.Serialization.Formatters.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Runtime.Serialization.Formatters.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.Serialization.Json">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Runtime.Serialization.Json.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Runtime.Serialization.Json.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.Serialization.Primitives">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Runtime.Serialization.Primitives.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Runtime.Serialization.Primitives.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.Serialization.Xml">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Runtime.Serialization.Xml.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Runtime.Serialization.Xml.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Runtime.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Runtime.dll</HintPath>
     </Reference>
     <Reference Include="System.Security.Claims">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Security.Claims.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Security.Claims.dll</HintPath>
     </Reference>
     <Reference Include="System.Security.Cryptography.Algorithms">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Security.Cryptography.Algorithms.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Security.Cryptography.Algorithms.dll</HintPath>
     </Reference>
     <Reference Include="System.Security.Cryptography.Csp">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Security.Cryptography.Csp.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Security.Cryptography.Csp.dll</HintPath>
     </Reference>
     <Reference Include="System.Security.Cryptography.Encoding">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Security.Cryptography.Encoding.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Security.Cryptography.Encoding.dll</HintPath>
     </Reference>
     <Reference Include="System.Security.Cryptography.Primitives">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Security.Cryptography.Primitives.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Security.Cryptography.Primitives.dll</HintPath>
     </Reference>
     <Reference Include="System.Security.Cryptography.X509Certificates">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Security.Cryptography.X509Certificates.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Security.Cryptography.X509Certificates.dll</HintPath>
     </Reference>
     <Reference Include="System.Security.Principal">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Security.Principal.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Security.Principal.dll</HintPath>
     </Reference>
     <Reference Include="System.Security.SecureString">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Security.SecureString.dll</HintPath>
-    </Reference>
-    <Reference Include="System.ServiceModel.Duplex">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.ServiceModel.Duplex.dll</HintPath>
-    </Reference>
-    <Reference Include="System.ServiceModel.Http">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.ServiceModel.Http.dll</HintPath>
-    </Reference>
-    <Reference Include="System.ServiceModel.NetTcp">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.ServiceModel.NetTcp.dll</HintPath>
-    </Reference>
-    <Reference Include="System.ServiceModel.Primitives">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.ServiceModel.Primitives.dll</HintPath>
-    </Reference>
-    <Reference Include="System.ServiceModel.Security">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.ServiceModel.Security.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Security.SecureString.dll</HintPath>
     </Reference>
     <Reference Include="System.Text.Encoding.Extensions">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Text.Encoding.Extensions.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Text.Encoding.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="System.Text.Encoding">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Text.Encoding.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Text.Encoding.dll</HintPath>
     </Reference>
     <Reference Include="System.Text.RegularExpressions">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Text.RegularExpressions.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Text.RegularExpressions.dll</HintPath>
     </Reference>
     <Reference Include="System.Threading.Overlapped">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Threading.Overlapped.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Threading.Overlapped.dll</HintPath>
     </Reference>
     <Reference Include="System.Threading.Tasks.Extensions">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Threading.Tasks.Extensions.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="System.Threading.Tasks.Parallel">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Threading.Tasks.Parallel.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Threading.Tasks.Parallel.dll</HintPath>
     </Reference>
     <Reference Include="System.Threading.Tasks">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Threading.Tasks.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Threading.Tasks.dll</HintPath>
     </Reference>
     <Reference Include="System.Threading.Thread">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Threading.Thread.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Threading.Thread.dll</HintPath>
     </Reference>
     <Reference Include="System.Threading.ThreadPool">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Threading.ThreadPool.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Threading.ThreadPool.dll</HintPath>
     </Reference>
     <Reference Include="System.Threading.Timer">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Threading.Timer.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Threading.Timer.dll</HintPath>
     </Reference>
     <Reference Include="System.Threading">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Threading.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Threading.dll</HintPath>
     </Reference>
     <Reference Include="System.ValueTuple">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.ValueTuple.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.ValueTuple.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml.ReaderWriter">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Xml.ReaderWriter.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Xml.ReaderWriter.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml.XDocument">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Xml.XDocument.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Xml.XDocument.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml.XPath.XDocument">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Xml.XPath.XDocument.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Xml.XPath.XDocument.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml.XPath">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Xml.XPath.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Xml.XPath.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml.XmlDocument">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Xml.XmlDocument.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Xml.XmlDocument.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml.XmlSerializer">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/System.Xml.XmlSerializer.dll</HintPath>
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netstandard/System.Xml.XmlSerializer.dll</HintPath>
     </Reference>
-    <Reference Include="netstandard">
-      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/UnityReferenceAssemblies/unity-4.8-api/Facades/netstandard.dll</HintPath>
+    <Reference Include="System.Runtime.InteropServices.WindowsRuntime">
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/Extensions/2.0.0/System.Runtime.InteropServices.WindowsRuntime.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ComponentModel.Composition">
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netfx/System.ComponentModel.Composition.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Core">
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netfx/System.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Data">
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netfx/System.Data.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Drawing">
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netfx/System.Drawing.dll</HintPath>
+    </Reference>
+    <Reference Include="System.IO.Compression.FileSystem">
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netfx/System.IO.Compression.FileSystem.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net">
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netfx/System.Net.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Numerics">
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netfx/System.Numerics.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.Serialization">
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netfx/System.Runtime.Serialization.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ServiceModel.Web">
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netfx/System.ServiceModel.Web.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Transactions">
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netfx/System.Transactions.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Web">
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netfx/System.Web.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Windows">
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netfx/System.Windows.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Xml.Linq">
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netfx/System.Xml.Linq.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Xml.Serialization">
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netfx/System.Xml.Serialization.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Xml">
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netfx/System.Xml.dll</HintPath>
+    </Reference>
+    <Reference Include="System">
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netfx/System.dll</HintPath>
+    </Reference>
+    <Reference Include="mscorlib">
+      <HintPath>/Applications/Unity/Hub/Editor/6000.3.0f1/Unity.app/Contents/Resources/Scripting/NetStandard/compat/2.1.0/shims/netfx/mscorlib.dll</HintPath>
     </Reference>
     <Reference Include="Analytics">
       <HintPath>/Users/dancrosby/CodingProjects/github/eagle0-unity-client/src/main/csharp/net/eagle0/clients/unity/eagle0/Library/ScriptAssemblies/Analytics.dll</HintPath>
@@ -1318,9 +1312,6 @@
     <Reference Include="Unity.TextMeshPro">
       <HintPath>/Users/dancrosby/CodingProjects/github/eagle0-unity-client/src/main/csharp/net/eagle0/clients/unity/eagle0/Library/ScriptAssemblies/Unity.TextMeshPro.dll</HintPath>
     </Reference>
-    <Reference Include="Unity.ResourceManager">
-      <HintPath>/Users/dancrosby/CodingProjects/github/eagle0-unity-client/src/main/csharp/net/eagle0/clients/unity/eagle0/Library/ScriptAssemblies/Unity.ResourceManager.dll</HintPath>
-    </Reference>
     <Reference Include="Unity.VisualStudio.Editor">
       <HintPath>/Users/dancrosby/CodingProjects/github/eagle0-unity-client/src/main/csharp/net/eagle0/clients/unity/eagle0/Library/ScriptAssemblies/Unity.VisualStudio.Editor.dll</HintPath>
     </Reference>
@@ -1333,15 +1324,9 @@
     <Reference Include="Unity.AI.Navigation">
       <HintPath>/Users/dancrosby/CodingProjects/github/eagle0-unity-client/src/main/csharp/net/eagle0/clients/unity/eagle0/Library/ScriptAssemblies/Unity.AI.Navigation.dll</HintPath>
     </Reference>
-    <Reference Include="Unity.Profiling.Core">
-      <HintPath>/Users/dancrosby/CodingProjects/github/eagle0-unity-client/src/main/csharp/net/eagle0/clients/unity/eagle0/Library/ScriptAssemblies/Unity.Profiling.Core.dll</HintPath>
-    </Reference>
     <Reference Include="Unity.Timeline.Editor">
       <HintPath>/Users/dancrosby/CodingProjects/github/eagle0-unity-client/src/main/csharp/net/eagle0/clients/unity/eagle0/Library/ScriptAssemblies/Unity.Timeline.Editor.dll</HintPath>
     </Reference>
-    <Reference Include="Unity.ScriptableBuildPipeline">
-      <HintPath>/Users/dancrosby/CodingProjects/github/eagle0-unity-client/src/main/csharp/net/eagle0/clients/unity/eagle0/Library/ScriptAssemblies/Unity.ScriptableBuildPipeline.dll</HintPath>
-    </Reference>
     <Reference Include="Cysharp.Net.Http.YetAnotherHttpHandler">
       <HintPath>/Users/dancrosby/CodingProjects/github/eagle0-unity-client/src/main/csharp/net/eagle0/clients/unity/eagle0/Library/ScriptAssemblies/Cysharp.Net.Http.YetAnotherHttpHandler.dll</HintPath>
     </Reference>
@@ -1366,18 +1351,12 @@
     <Reference Include="Unity.AI.Navigation.Updater">
       <HintPath>/Users/dancrosby/CodingProjects/github/eagle0-unity-client/src/main/csharp/net/eagle0/clients/unity/eagle0/Library/ScriptAssemblies/Unity.AI.Navigation.Updater.dll</HintPath>
     </Reference>
-    <Reference Include="Unity.ScriptableBuildPipeline.Editor">
-      <HintPath>/Users/dancrosby/CodingProjects/github/eagle0-unity-client/src/main/csharp/net/eagle0/clients/unity/eagle0/Library/ScriptAssemblies/Unity.ScriptableBuildPipeline.Editor.dll</HintPath>
+    <Reference Include="Unity.Multiplayer.Center.Editor">
+      <HintPath>/Users/dancrosby/CodingProjects/github/eagle0-unity-client/src/main/csharp/net/eagle0/clients/unity/eagle0/Library/ScriptAssemblies/Unity.Multiplayer.Center.Editor.dll</HintPath>
     </Reference>
     <Reference Include="Unity.PlasticSCM.Editor">
       <HintPath>/Users/dancrosby/CodingProjects/github/eagle0-unity-client/src/main/csharp/net/eagle0/clients/unity/eagle0/Library/ScriptAssemblies/Unity.PlasticSCM.Editor.dll</HintPath>
     </Reference>
-    <Reference Include="Unity.Addressables">
-      <HintPath>/Users/dancrosby/CodingProjects/github/eagle0-unity-client/src/main/csharp/net/eagle0/clients/unity/eagle0/Library/ScriptAssemblies/Unity.Addressables.dll</HintPath>
-    </Reference>
-    <Reference Include="Unity.Multiplayer.Center.Editor">
-      <HintPath>/Users/dancrosby/CodingProjects/github/eagle0-unity-client/src/main/csharp/net/eagle0/clients/unity/eagle0/Library/ScriptAssemblies/Unity.Multiplayer.Center.Editor.dll</HintPath>
-    </Reference>
     <Reference Include="Unity.Services.Core.Components">
       <HintPath>/Users/dancrosby/CodingProjects/github/eagle0-unity-client/src/main/csharp/net/eagle0/clients/unity/eagle0/Library/ScriptAssemblies/Unity.Services.Core.Components.dll</HintPath>
     </Reference>
@@ -1393,9 +1372,6 @@
     <Reference Include="Unity.AI.Navigation.Editor.ConversionSystem">
       <HintPath>/Users/dancrosby/CodingProjects/github/eagle0-unity-client/src/main/csharp/net/eagle0/clients/unity/eagle0/Library/ScriptAssemblies/Unity.AI.Navigation.Editor.ConversionSystem.dll</HintPath>
     </Reference>
-    <Reference Include="Unity.Addressables.Editor">
-      <HintPath>/Users/dancrosby/CodingProjects/github/eagle0-unity-client/src/main/csharp/net/eagle0/clients/unity/eagle0/Library/ScriptAssemblies/Unity.Addressables.Editor.dll</HintPath>
-    </Reference>
     <Reference Include="UnityEditor.UI">
       <HintPath>/Users/dancrosby/CodingProjects/github/eagle0-unity-client/src/main/csharp/net/eagle0/clients/unity/eagle0/Library/ScriptAssemblies/UnityEditor.UI.dll</HintPath>
     </Reference>