From c71a34a1e9824743429af1d93d874b8ade24d3bf Mon Sep 17 00:00:00 2001
From: Wojtek Figat <wojtek@figat.pl>
Date: Tue, 21 Mar 2023 22:57:41 +0100
Subject: [PATCH] Reenable Android CI build

---
 .github/workflows/build_android.yml | 4 +++-
 .github/workflows/build_linux.yml   | 2 ++
 .github/workflows/build_mac.yml     | 2 ++
 .github/workflows/build_windows.yml | 2 ++
 .github/workflows/cd.yml            | 6 ++++++
 .github/workflows/tests.yml         | 2 ++
 6 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build_android.yml b/.github/workflows/build_android.yml
index 6228f52a7..077ee8cd6 100644
--- a/.github/workflows/build_android.yml
+++ b/.github/workflows/build_android.yml
@@ -9,7 +9,6 @@ jobs:
 
   # Game
   game-windows:
-    if: ${{ false }}
     name: Game (Android, Release ARM64)
     runs-on: "windows-2022"
     steps:
@@ -21,9 +20,12 @@ jobs:
       uses: actions/setup-dotnet@v3
       with:
         dotnet-version: 7.0.x
+      run: |
+        dotnet workload install android
     - name: Print .NET info
       run: |
         dotnet --info
+        dotnet workload --info
     - name: Checkout LFS
       run: |
         git lfs version
diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml
index 3d5f6d8a5..238bd0c62 100644
--- a/.github/workflows/build_linux.yml
+++ b/.github/workflows/build_linux.yml
@@ -29,6 +29,7 @@ jobs:
     - name: Print .NET info
       run: |
         dotnet --info
+        dotnet workload --info
     - name: Checkout LFS
       run: |
         git lfs version
@@ -56,6 +57,7 @@ jobs:
     - name: Print .NET info
       run: |
         dotnet --info
+        dotnet workload --info
     - name: Checkout LFS
       run: |
         git lfs version
diff --git a/.github/workflows/build_mac.yml b/.github/workflows/build_mac.yml
index 086f587ef..790b9cb3b 100644
--- a/.github/workflows/build_mac.yml
+++ b/.github/workflows/build_mac.yml
@@ -23,6 +23,7 @@ jobs:
     - name: Print .NET info
       run: |
         dotnet --info
+        dotnet workload --info
     - name: Checkout LFS
       run: |
         git lfs version
@@ -47,6 +48,7 @@ jobs:
     - name: Print .NET info
       run: |
         dotnet --info
+        dotnet workload --info
     - name: Checkout LFS
       run: |
         git lfs version
diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml
index 0cf757b08..fecc5216d 100644
--- a/.github/workflows/build_windows.yml
+++ b/.github/workflows/build_windows.yml
@@ -23,6 +23,7 @@ jobs:
     - name: Print .NET info
       run: |
         dotnet --info
+        dotnet workload --info
     - name: Checkout LFS
       run: |
         git lfs version
@@ -47,6 +48,7 @@ jobs:
     - name: Print .NET info
       run: |
         dotnet --info
+        dotnet workload --info
     - name: Checkout LFS
       run: |
         git lfs version
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index f8ee1d24e..a5d8bc043 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -30,6 +30,7 @@ jobs:
     - name: Print .NET info
       run: |
         dotnet --info
+        dotnet workload --info
     - name: Build
       run: |
         .\PackageEditor.bat -arch=x64 -platform=Windows -deployOutput=Output
@@ -62,6 +63,7 @@ jobs:
     - name: Print .NET info
       run: |
         dotnet --info
+        dotnet workload --info
     - name: Build
       run: |
         .\PackagePlatforms.bat -arch=x64 -platform=Windows -deployOutput=Output
@@ -97,6 +99,7 @@ jobs:
     - name: Print .NET info
       run: |
         dotnet --info
+        dotnet workload --info
     - name: Build
       run: |
         ./PackageEditor.sh -arch=x64 -platform=Linux -deployOutput=Output
@@ -130,6 +133,7 @@ jobs:
     - name: Print .NET info
       run: |
         dotnet --info
+        dotnet workload --info
     - name: Build
       run: |
         ./PackagePlatforms.sh -arch=x64 -platform=Linux -deployOutput=Output
@@ -159,6 +163,7 @@ jobs:
     - name: Print .NET info
       run: |
         dotnet --info
+        dotnet workload --info
     - name: Build
       run: |
         ./PackageEditor.command -arch=x64 -platform=Mac -deployOutput=Output
@@ -186,6 +191,7 @@ jobs:
     - name: Print .NET info
       run: |
         dotnet --info
+        dotnet workload --info
     - name: Build
       run: |
         ./PackagePlatforms.command -arch=x64 -platform=Mac -deployOutput=Output
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index e3c54b253..06939113c 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -21,6 +21,7 @@ jobs:
     - name: Print .NET info
       run: |
         dotnet --info
+        dotnet workload --info
     - name: Checkout LFS
       run: |
         git lfs version
@@ -64,6 +65,7 @@ jobs:
     - name: Print .NET info
       run: |
         dotnet --info
+        dotnet workload --info
     - name: Checkout LFS
       run: |
         git lfs version