CI: build snap packages with stockdotnet6+xbuild

.github/workflows/CI.yml

@@ -634,18 +634,19 @@ 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
+        sudo apt install --yes git make dotnet6 mono-xbuild fsharp
+        sudo apt install -y libgtk2.0-cil-dev
         ./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`
+    - name: HACK to emulate msbuild uninstall
+      run: sudo rm `which msbuild`
 
     - name: Generate snap package
       run: |

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

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
 

scripts/snap_install_as_docker.sh

@@ -84,7 +84,7 @@ ENV LANG C.UTF-8
 ENV LC_ALL C.UTF-8
 RUN apt update &&\
  DEBIAN_FRONTEND=noninteractive\
- apt install -y fuse snapd snap-confine squashfuse sudo init lsb-release git docker.io build-essential pkg-config curl &&\
+ apt install -y dotnet6 mono-xbuild fsharp fuse snapd snap-confine squashfuse sudo init lsb-release git docker.io build-essential pkg-config curl &&\
  apt install -y libgtk2.0-cil-dev &&\
  apt clean &&\
  dpkg-divert --local --rename --add /sbin/udevadm &&\
@@ -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

snap/snapcraft.yaml

@@ -1,5 +1,5 @@
 name: geewallet
-base: core20 # the base snap is the execution environment for this snap
+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: |
@@ -33,7 +33,9 @@ parts:
     plugin: dump
     source: ./staging
     stage-packages:
-      - mono-devel
+      - dotnet6
+      - mono-xbuild
+      - fsharp
       - libgtk2.0-cil
 
   certs:
@@ -51,7 +53,6 @@ parts:
       - libgtk2.0-dev
     stage-packages:
       - libxkbcommon0  # XKB_CONFIG_ROOT
-      - ttf-ubuntu-font-family
       - dmz-cursor-theme
       - light-themes
       - adwaita-icon-theme