From b94fe8088590b48e98126a601c85e1a9d0773962 Mon Sep 17 00:00:00 2001
From: Afshin Arani <afshin@arani.dev>
Date: Mon, 21 Aug 2023 12:32:26 +0330
Subject: [PATCH] CI: build snap packages with stockdotnet6+xbuild

---
 .github/workflows/CI.yml                   | 9 ++++-----
 scripts/snap_build.sh                      | 2 +-
 scripts/snap_build_and_upload_as_docker.sh | 2 +-
 scripts/snap_install_as_docker.sh          | 2 --
 snap/snapcraft.yaml                        | 7 +++----
 5 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 172169307..026358e8b 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -634,18 +634,17 @@ jobs:
     needs:
     - conventions
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v1
     - name: Install snap tools
       run: |
         sudo apt update
-        sudo ./scripts/install_mono_from_microsoft_deb_packages.sh
         ./scripts/install_snapcraft.sh
 
-    # hack to disable dotnet detection (can't use apt purge because github VM seems to have it installed in different way)
-    - name: HACK to emulate dotnet uninstall
-      run: sudo rm `which dotnet`
+    # hack to disable msbuild detection
+    - name: HACK to emulate msbuild uninstall
+      run: sudo rm `which msbuild`
 
     - name: Generate snap package
       run: |
diff --git a/scripts/snap_build.sh b/scripts/snap_build.sh
index a17a690c1..b4f1b77bc 100755
--- a/scripts/snap_build.sh
+++ b/scripts/snap_build.sh
@@ -3,7 +3,7 @@ set -euxo pipefail
 
 # this is the equivalent of using the 'build-packages' (not stage-packages) section in snapcraft
 # but as we're not using the 'make' plugin, we need to this manually now
-DEBIAN_FRONTEND=noninteractive sudo apt install -y fsharp build-essential pkg-config cli-common-dev mono-devel libgtk2.0-cil-dev
+DEBIAN_FRONTEND=noninteractive sudo apt install -y fsharp build-essential pkg-config cli-common-dev mono-xbuild libgtk2.0-cil-dev dotnet6
 
 
 ./configure.sh --prefix=./staging
diff --git a/scripts/snap_build_and_upload_as_docker.sh b/scripts/snap_build_and_upload_as_docker.sh
index 0e477ecd5..216a7bf32 100755
--- a/scripts/snap_build_and_upload_as_docker.sh
+++ b/scripts/snap_build_and_upload_as_docker.sh
@@ -26,7 +26,7 @@ docker exec snappy make install
 
 # Install snapcraft and dependencies
 docker exec snappy snap version
-docker exec snappy snap install core20
+docker exec snappy snap install core22
 docker exec snappy snap install --classic --stable snapcraft
 docker exec snappy snapcraft --version
 
diff --git a/scripts/snap_install_as_docker.sh b/scripts/snap_install_as_docker.sh
index 3d54327a4..92ea1cd26 100755
--- a/scripts/snap_install_as_docker.sh
+++ b/scripts/snap_install_as_docker.sh
@@ -133,7 +133,5 @@ echo " done"
 $SUDO docker exec $CONTNAME snap install core || clean_up
 echo "container $CONTNAME started ..."
 
-$SUDO docker exec $CONTNAME scripts/install_mono_from_microsoft_deb_packages.sh
-
 print_info
 rm_builddir
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 5843b5668..c6a63f89e 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,6 +1,6 @@
 name: geewallet
-base: core20 # the base snap is the execution environment for this snap
-version: '0.4.381.0' # just for humans, typically '1.2+git' or '1.3.2'
+base: core22 # the base snap is the execution environment for this snap
+version: "0.4.381.0" # just for humans, typically '1.2+git' or '1.3.2'
 summary: minimalistic cryptocurrency brainwallet # 79 char long summary
 description: |
   Non-custodial, minimalistic and pragmatist opensource crossplatform
@@ -50,8 +50,7 @@ parts:
     build-packages:
       - libgtk2.0-dev
     stage-packages:
-      - libxkbcommon0  # XKB_CONFIG_ROOT
-      - ttf-ubuntu-font-family
+      - libxkbcommon0 # XKB_CONFIG_ROOT
       - dmz-cursor-theme
       - light-themes
       - adwaita-icon-theme