code REORG, pour partage pkg version entre app et tests

Two adjustments after the Android boot investigation
(cf. AGENTS.md section 'PostIt.Android boot crash sur AVD
x86_64 : investigation par couches'):

- Avalonia 12.0.4 -> 12.1.1 in PostIt/Directory.Packages.props.
  12.1.x is the current Avalonia 12 stable line; 12.0.4 had a
  known WindowingPlatformStub regression on Pixel x86_64 AVDs
  (issue AvaloniaUI/Avalonia#18459 family). 12.1.1 does not
  actually fix the layer-3 NotSupportedException on this
  specific Pixel + Android 16 + x86_64 combination (verified
  by rebuild + logcat capture on 2026-08-22), but staying on
  12.0.4 forever is wrong, and 12.1.1 is the baseline most
  users are on. The Makefile qemu-build already passes
  -p:EmbedAssembliesIntoApk=true and -p:RuntimeIdentifier=
  android-x64 to work around the Fast Deployment / AOT issues.

- qemu-logcat-boot LOGCAT_BOOT_WAIT 15s -> 30s. The crash
  reproduces well under 5s, so the wait value is moot for
  diagnosis, but 30s gives a wider margin when the runtime
  happens to be slow to JIT (boot tries to draw a frame in
  texture-pass scenarios). Override on the command line is
  unchanged: 'make qemu-logcat-boot LOGCAT_BOOT_WAIT=N'.

No MAUI change: Microsoft.Maui.Essentials was deliberately
unhooked during a hypothesis check and put back to keep the
contact-flow code path stable. The MAUI removal made no
difference to the crash (verified).

.forgejo/workflows/release.yml

@@ -194,7 +194,7 @@ jobs:
         # la racine du checkout pour que l'étape d'upload le trouve.
         run: |
           cd /src/_src
-          APK=src/PostIt/PostIt.Android/bin/Release/net10.0-android/android-arm64/com.CompanyName.PostIt-Signed.apk
+          APK=src/PostIt/PostIt.Android/bin/Release/net10.0-android/android-arm64/fr.pschneider.PostIt-Signed.apk
           if [[ ! -f "$APK" ]]; then
             echo "::error::APK not found at $APK"
             ls -la src/PostIt/PostIt.Android/bin/Release/net10.0-android/ 2>/dev/null || true

.github/workflows/docker-publish-android.yml

@@ -40,7 +40,7 @@ jobs:
       - name: Extraire l'APK du conteneur Docker
         run: |
           docker create --name extractor postit-android
-          docker cp extractor:/src/src/PostIt/PostIt.Android/bin/Release/net10.0-android/android-arm64/com.CompanyName.PostIt-Signed.apk ./PostIt.Android.apk
+          docker cp extractor:/src/src/PostIt/PostIt.Android/bin/Release/net10.0-android/android-arm64/fr.pschneider.PostIt-Signed.apk ./PostIt.Android.apk
           docker rm extractor
 
       - name: Téléverser l'APK en tant qu'Artéfact GitHub

Makefile

@@ -152,7 +152,7 @@ release:
 #   LOGCAT_FOLLOW   default: 0
 #                    (1 = stream live via `make qemu-logcat`,
 #                    sinon dump one-shot des N dernières lignes)
-#   LOGCAT_BOOT_WAIT default: 5
+#   LOGCAT_BOOT_WAIT default: 30
 #                    (secondes d'attente entre le clear du buffer,
 #                    le `am start`, et le dump final dans
 #                    `make qemu-logcat-boot`)
@@ -163,11 +163,11 @@ POSTIT_RID ?= android-x64
 EMU_HEADLESS ?= 0
 LOGCAT_LINES ?= 200
 LOGCAT_FOLLOW ?= 0
-LOGCAT_BOOT_WAIT ?= 10
+LOGCAT_BOOT_WAIT ?= 30
 
 POSTIT_ANDROID_CSPROJ := src/PostIt/PostIt.Android/PostIt.Android.csproj
 POSTIT_APK_DIR := src/PostIt/PostIt.Android/bin/$(CONFIG)/net10.0-android/$(POSTIT_RID)
-POSTIT_APK := $(POSTIT_APK_DIR)/com.CompanyName.PostIt-Signed.apk
+POSTIT_APK := $(POSTIT_APK_DIR)/fr.pschneider.PostIt-Signed.apk
 
 qemu-run:
 	@echo "  Starting AVD $(AVD_NAME) on $(ADB_SERIAL)..."
@@ -226,12 +226,12 @@ qemu-install: qemu-build
 	adb -s $(ADB_SERIAL) install -r "$(POSTIT_APK)"
 
 qemu-uninstall:
-	adb -s $(ADB_SERIAL) uninstall com.CompanyName.PostIt
+	adb -s $(ADB_SERIAL) uninstall fr.pschneider.PostIt
 
 # Dump recent logcat output for the running PostIt.Android process.
 # By default, prints the last $(LOGCAT_LINES) lines (one-shot, with
 # `-d`). Set LOGCAT_FOLLOW=1 to follow the stream live instead.
-# Filtering is by PID (pidof com.CompanyName.PostIt), not by tag,
+# Filtering is by PID (pidof fr.pschneider.PostIt), not by tag,
 # because Mono/Xamarin can emit logs under several tags
 # (mono, PostIt.Android, Avalonia.Android) and tag-based filtering
 # would miss the ones not matching. PID-based filtering is exact.
@@ -239,17 +239,17 @@ qemu-uninstall:
 # silently with no output; that is the expected behaviour for
 # "no logs yet".
 qemu-logcat:
-	@PID=$$(adb -s $(ADB_SERIAL) shell pidof com.CompanyName.PostIt 2>/dev/null | tr -d '\r\n'); \
+	@PID=$$(adb -s $(ADB_SERIAL) shell pidof fr.pschneider.PostIt 2>/dev/null | tr -d '\r\n'); \
 	if [ -z "$$PID" ]; then \
-	    echo "  com.CompanyName.PostIt is not running on $(ADB_SERIAL)."; \
+	    echo "  fr.pschneider.PostIt is not running on $(ADB_SERIAL)."; \
-	    echo "  Start the app first (am start -n com.CompanyName.PostIt/PostIt.Android.PostItMainActivity)"; \
+	    echo "  Start the app first (am start -n fr.pschneider.PostIt/PostIt.Android.PostItMainActivity)"; \
 	    exit 1; \
 	fi; \
 	echo "  Following PID $$PID (LOGCAT_FOLLOW=$(LOGCAT_FOLLOW), LOGCAT_LINES=$(LOGCAT_LINES))"; \
 	if [ "$(LOGCAT_FOLLOW)" = "1" ]; then \
-	    adb -s $(ADB_SERIAL) logcat -v time --pid=$$PID com.CompanyName.PostIt:F; \
+	    adb -s $(ADB_SERIAL) logcat -v time --pid=$$PID fr.pschneider.PostIt:F; \
 	else \
-	    adb -s $(ADB_SERIAL) logcat -d -v time -t $(LOGCAT_LINES) --pid=$$PID com.CompanyName.PostIt:F; \
+	    adb -s $(ADB_SERIAL) logcat -d -v time -t $(LOGCAT_LINES) --pid=$$PID fr.pschneider.PostIt:F; \
 	fi
 
 # Clear logcat, launch PostIt.Android, then dump everything that was
@@ -263,13 +263,13 @@ LOGCAT_BOOT_WAIT ?= 15
 qemu-logcat-boot:
 	@echo "  Clearing logcat buffer..."
 	adb -s $(ADB_SERIAL) logcat -c
-	@echo "  Launching com.CompanyName.PostIt..."
+	@echo "  Launching fr.pschneider.PostIt..."
 	adb -s $(ADB_SERIAL) shell am start \
-	    -n com.CompanyName.PostIt/PostIt.Android.PostItMainActivity
+	    -n fr.pschneider.PostIt/PostIt.Android.PostItMainActivity
 	@echo "  Waiting $(LOGCAT_BOOT_WAIT)s for the app to start rendering..."
 	@sleep $(LOGCAT_BOOT_WAIT)
 	@echo "  Dumping logcat (PostIt PID + system buffer):"
-	@PID=$$(adb -s $(ADB_SERIAL) shell pidof com.CompanyName.PostIt 2>/dev/null | tr -d '\r\n'); \
+	@PID=$$(adb -s $(ADB_SERIAL) shell pidof fr.pschneider.PostIt 2>/dev/null | tr -d '\r\n'); \
 	if [ -n "$$PID" ]; then \
 	    echo "  (PID $$PID at dump time)"; \
 	    adb -s $(ADB_SERIAL) logcat -d -v time --pid=$$PID; \

src/PostIt.Tests/pslist

@@ -1,94 +0,0 @@
-UID          PID    PPID  C STIME TTY          TIME CMD
-paul        1155       1  0 13:18 ?        00:00:00 /usr/lib/systemd/systemd --user
-paul        1168    1155  0 13:18 ?        00:00:00 (sd-pam)
-paul        1361    1155  0 13:18 ?        00:00:00 /usr/bin/dbus-daemon --session --address=systemd: --nofork --nopidfile --systemd-activation --syslog-only
-paul        1364    1155  1 13:18 ?        00:01:19 /home/paul/.nvm/versions/node/v22.23.0/bin/node /home/paul/.nvm/versions/node/v22.23.0/lib/node_modules/openclaw/dist/index.js gateway --port 18789
-paul        1367    1155  0 13:18 ?        00:00:00 /usr/bin/pipewire
-paul        1372    1155  0 13:18 ?        00:00:00 /usr/bin/pipewire -c filter-chain.conf
-paul        1373    1155  0 13:18 ?        00:00:00 /usr/bin/wireplumber
-paul        1374    1155  0 13:18 ?        00:00:00 /usr/bin/pipewire-pulse
-paul        1444    1155  0 13:18 ?        00:00:00 /usr/bin/mpris-proxy
-paul        2593    1155  0 13:19 ?        00:00:00 /usr/bin/gnome-keyring-daemon --foreground --components=pkcs11,secrets --control-directory=/run/user/1000/keyring
-paul        2608    2487  0 13:19 tty2     00:00:00 /usr/libexec/gdm-x-session --run-script /usr/bin/gnome-session
-paul        2617    2608  1 13:19 tty2     00:01:12 /usr/lib/xorg/Xorg vt2 -displayfd 3 -auth /run/user/1000/gdm/Xauthority -nolisten tcp -background none -noreset -keeptty -novtswitch -verbose 3
-paul        2647    2608  0 13:19 tty2     00:00:00 /usr/libexec/gnome-session-binary
-paul        2785    1155  0 13:19 ?        00:00:00 /usr/libexec/at-spi-bus-launcher
-paul        2792    2785  0 13:19 ?        00:00:00 /usr/bin/dbus-daemon --config-file=/usr/share/defaults/at-spi2/accessibility.conf --nofork --print-address 11 --address=unix:path=/run/user/1000/at-spi/bus_1
-paul        2802    1155  0 13:19 ?        00:00:00 /usr/libexec/gcr-ssh-agent --base-dir /run/user/1000/gcr
-paul        2803    1155  0 13:19 ?        00:00:00 /usr/libexec/gnome-session-ctl --monitor
-paul        2804    1155  0 13:19 ?        00:00:00 /usr/bin/ssh-agent -D
-paul        2814    1155  0 13:19 ?        00:00:00 /usr/libexec/gvfsd
-paul        2828    1155  0 13:19 ?        00:00:00 /usr/libexec/gvfsd-fuse /run/user/1000/gvfs -f
-paul        2838    1155  0 13:19 ?        00:00:00 /usr/libexec/gnome-session-binary --systemd-service --session=gnome
-paul        2874    1155  3 13:19 ?        00:02:13 /usr/bin/gnome-shell
-paul        2896    2874  0 13:19 ?        00:00:01 /usr/libexec/mutter-x11-frames
-paul        2902    1155  0 13:19 ?        00:00:00 /usr/libexec/at-spi2-registryd --use-gnome-session
-paul        2918    1155  0 13:19 ?        00:00:00 /usr/libexec/xdg-desktop-portal
-paul        2933    1155  0 13:19 ?        00:00:00 /usr/libexec/xdg-permission-store
-paul        2938    1155  0 13:19 ?        00:00:00 /usr/libexec/xdg-document-portal
-paul        2971    1155  0 13:19 ?        00:00:00 /usr/libexec/gnome-shell-calendar-server
-paul        2976    1155  0 13:19 ?        00:00:00 /usr/libexec/dconf-service
-paul        2992    1155  0 13:19 ?        00:00:00 /usr/libexec/evolution-source-registry
-paul        2994    1155  0 13:19 ?        00:00:00 /usr/bin/gjs -m /usr/share/gnome-shell/org.gnome.Shell.Notifications
-paul        3012    1155  0 13:19 ?        00:00:12 /usr/bin/ibus-daemon --panel disable --xim
-paul        3013    1155  0 13:19 ?        00:00:00 /usr/libexec/gsd-a11y-settings
-paul        3014    1155  0 13:19 ?        00:00:00 /usr/libexec/gsd-color
-paul        3015    1155  0 13:19 ?        00:00:00 /usr/libexec/gsd-datetime
-paul        3016    1155  0 13:19 ?        00:00:00 /usr/libexec/gsd-housekeeping
-paul        3018    1155  0 13:19 ?        00:00:00 /usr/libexec/gsd-keyboard
-paul        3024    1155  0 13:19 ?        00:00:00 /usr/libexec/gsd-media-keys
-paul        3025    1155  0 13:19 ?        00:00:00 /usr/libexec/gsd-power
-paul        3027    1155  0 13:19 ?        00:00:00 /usr/libexec/gsd-print-notifications
-paul        3029    1155  0 13:19 ?        00:00:00 /usr/libexec/gsd-rfkill
-paul        3030    1155  0 13:19 ?        00:00:00 /usr/libexec/gsd-screensaver-proxy
-paul        3035    2838  0 13:19 ?        00:00:05 /usr/bin/gnome-software --gapplication-service
-paul        3037    1155  0 13:19 ?        00:00:00 /usr/libexec/gsd-sharing
-paul        3042    1155  0 13:19 ?        00:00:00 /usr/libexec/gsd-smartcard
-paul        3048    1155  0 13:19 ?        00:00:00 /usr/libexec/gsd-sound
-paul        3054    1155  0 13:19 ?        00:00:00 /usr/libexec/gsd-usb-protection
-paul        3057    1155  0 13:19 ?        00:00:00 /usr/libexec/gsd-wacom
-paul        3058    1155  0 13:19 ?        00:00:00 /usr/libexec/gsd-xsettings
-paul        3059    2838  0 13:19 ?        00:00:00 /usr/libexec/evolution-data-server/evolution-alarm-notify
-paul        3064    2838  0 13:19 ?        00:00:00 /usr/bin/kalendarac
-paul        3070    2838  0 13:19 ?        00:00:00 /usr/libexec/gsd-disk-utility-notify
-paul        3088    2838  0 13:19 ?        00:00:00 /usr/bin/kdeconnectd
-paul        3168    1155  0 13:19 ?        00:00:00 /usr/bin/gjs -m /usr/share/gnome-shell/org.gnome.ScreenSaver
-paul        3172    1155  0 13:19 ?        00:00:00 /usr/libexec/gsd-printer
-paul        3207    3012  0 13:19 ?        00:00:00 /usr/libexec/ibus-memconf
-paul        3208    3012  0 13:19 ?        00:00:06 /usr/libexec/ibus-extension-gtk3
-paul        3214    1155  0 13:19 ?        00:00:00 /usr/libexec/ibus-x11 --kill-daemon
-paul        3216    1155  0 13:19 ?        00:00:00 /usr/libexec/ibus-portal
-paul        3218    1155  0 13:19 ?        00:00:00 /usr/libexec/localsearch-3
-paul        3219    1155  0 13:19 ?        00:00:00 /usr/libexec/xdg-desktop-portal-gnome
-paul        3241    1155  0 13:19 ?        00:00:00 /usr/libexec/gvfs-udisks2-volume-monitor
-paul        3251    1155  0 13:19 ?        00:00:00 /usr/libexec/gvfs-mtp-volume-monitor
-paul        3259    1155  0 13:19 ?        00:00:00 /usr/libexec/gvfs-gphoto2-volume-monitor
-paul        3265    1155  0 13:20 ?        00:00:00 /usr/libexec/gvfs-goa-volume-monitor
-paul        3271    1155  0 13:20 ?        00:00:00 /usr/libexec/goa-daemon
-paul        3280    1155  0 13:20 ?        00:00:00 /usr/libexec/goa-identity-service
-paul        3287    1155  0 13:20 ?        00:00:00 /usr/libexec/gvfs-afc-volume-monitor
-paul        3303    3012  0 13:20 ?        00:00:02 /usr/libexec/ibus-engine-simple
-paul        3372    1155  0 13:20 ?        00:00:00 /usr/libexec/xdg-desktop-portal-gtk
-paul        3441    1155  0 13:20 ?        00:00:00 /usr/libexec/gvfsd-metadata
-paul        3453    1155  0 13:20 ?        00:00:00 /usr/libexec/evolution-calendar-factory
-paul        3495    1155  0 13:20 ?        00:00:00 /usr/libexec/evolution-addressbook-factory
-paul        4798    1155  0 13:26 ?        00:00:09 /usr/libexec/gnome-terminal-server
-paul        4810    4798  0 13:26 pts/0    00:00:00 bash
-paul        8614    1155  0 13:29 ?        00:00:01 /usr/bin/speech-dispatcher -s -t 0
-paul        8656    8614  0 13:29 ?        00:00:00 [sd_espeak-ng-mb] <defunct>
-paul        8709    8614  0 13:29 ?        00:00:00 /usr/lib/speech-dispatcher-modules/sd_espeak-ng /etc/speech-dispatcher/modules/espeak-ng.conf
-paul        8785    8614  0 13:29 ?        00:00:00 /usr/lib/speech-dispatcher-modules/sd_dummy /etc/speech-dispatcher/modules/dummy.conf
-paul        8799    8614  0 13:29 ?        00:00:00 /usr/lib/speech-dispatcher-modules/sd_espeak-ng /etc/speech-dispatcher/modules/
-paul       10028    1155  0 13:31 ?        00:00:00 adb -L tcp:5037 fork-server server --reply-fd 4
-paul       69578    2814  0 13:53 ?        00:00:00 /usr/libexec/gvfsd-http --spawner :1.22 /org/gtk/gvfs/exec_spaw/0
-paul      108341    1155  3 14:06 ?        00:00:48 /home/paul/.nvm/versions/node/v22.23.0/bin/node /home/paul/.nvm/versions/node/v22.23.0/lib/node_modules/acpx/dist/cli.js __queue-owner
-paul      108416  108341  0 14:06 ?        00:00:00 openclaw
-paul      108458  108416  2 14:06 ?        00:00:37 openclaw-acp
-paul      143553    1155  0 14:19 ?        00:00:05 /home/paul/Workspace/yavsc/src/PostIt.Tests/bin/Debug/net10.0/PostIt.Tests @@ /tmp/tmpI2JxLw.tmp
-paul      149205    1155  0 14:21 ?        00:00:05 /home/paul/Workspace/yavsc/src/PostIt.Tests/bin/Debug/net10.0/PostIt.Tests @@ /tmp/tmpitRyQG.tmp
-paul      151724    1155  0 14:22 ?        00:00:04 /home/paul/Workspace/yavsc/src/PostIt.Tests/bin/Debug/net10.0/PostIt.Tests @@ /tmp/tmpJEsOZV.tmp
-paul      157447    1155  1 14:24 ?        00:00:05 /home/paul/Workspace/yavsc/src/PostIt.Tests/bin/Debug/net10.0/PostIt.Tests @@ /tmp/tmpyM92DV.tmp
-paul      165231    1155  0 14:26 ?        00:00:01 /home/paul/Workspace/yavsc/src/PostIt.Tests/bin/Debug/net10.0/PostIt.Tests @@ /tmp/tmp5CKC19.tmp
-paul      168472    1155  4 14:27 ?        00:00:09 /home/paul/Workspace/yavsc/src/PostIt.Tests/bin/Debug/net10.0/PostIt.Tests @@ /tmp/tmpuRJsnQ.tmp
-paul      172147    1155  4 14:29 pts/0    00:00:05 /home/paul/Workspace/yavsc/src/PostIt.Tests/bin/Debug/net10.0/PostIt.Tests @@ /tmp/tmpxT8nje.tmp
-paul      172435    4810 99 14:31 pts/0    00:00:00 ps -fu paul

src/PostIt/Directory.Packages.props

@@ -3,19 +3,19 @@
   <Import Project="$([MSBuild]::GetPathOfFileAbove('Directory.Packages.props', '$(MSBuildThisFileDirectory)../'))" />
   <!-- PostIt-product-specific versions -->
   <ItemGroup>
-    <PackageVersion Include="Avalonia" Version="12.0.4" />
+    <PackageVersion Include="Avalonia" Version="12.1.1" />
-    <PackageVersion Include="Avalonia.Android" Version="12.0.4" />
+    <PackageVersion Include="Avalonia.Android" Version="12.1.1" />
     <PackageVersion Include="Avalonia.AvaloniaEdit" Version="12.0.0" />
-    <PackageVersion Include="Avalonia.Browser" Version="12.0.4" />
+    <PackageVersion Include="Avalonia.Browser" Version="12.1.1" />
-    <PackageVersion Include="Avalonia.Desktop" Version="12.0.4" />
+    <PackageVersion Include="Avalonia.Desktop" Version="12.1.1" />
-    <PackageVersion Include="Avalonia.Fonts.Inter" Version="12.0.4" />
+    <PackageVersion Include="Avalonia.Fonts.Inter" Version="12.1.1" />
-    <PackageVersion Include="Avalonia.Themes.Fluent" Version="12.0.4" />
+    <PackageVersion Include="Avalonia.Themes.Fluent" Version="12.1.1" />
-    <PackageVersion Include="AvaloniaUI.DiagnosticsSupport" Version="2.2.2" />
+    <PackageVersion Include="AvaloniaUI.DiagnosticsSupport" Version="2.2.3" />
     <PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.2" />
-    <PackageVersion Include="Material.Avalonia" Version="3.17.0" />
+    <PackageVersion Include="Material.Avalonia" Version="3.19.0" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.9" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.11" />
-    <PackageVersion Include="Microsoft.Maui.Essentials" Version="10.0.90" />
+    <PackageVersion Include="Microsoft.Maui.Essentials" Version="10.0.100" />
-    <PackageVersion Include="Xamarin.AndroidX.Browser" Version="1.8.0.11" />
+    <PackageVersion Include="Xamarin.AndroidX.Browser" Version="1.10.0.1" />
-    <PackageVersion Include="Xamarin.AndroidX.Core.SplashScreen" Version="1.2.0" />
+    <PackageVersion Include="Xamarin.AndroidX.Core.SplashScreen" Version="1.2.0.3" />
   </ItemGroup>
 </Project>

src/PostIt/PostIt.Android/PostIt.Android.csproj

@@ -6,7 +6,7 @@
     <RuntimeIdentifiers>android-arm64;android-x64</RuntimeIdentifiers>
     <SupportedOSPlatformVersion>23.0.0</SupportedOSPlatformVersion>
     <Nullable>enable</Nullable>
-    <ApplicationId>com.CompanyName.PostIt</ApplicationId>
+    <ApplicationId>fr.pschneider.PostIt</ApplicationId>
     <ApplicationVersion>1</ApplicationVersion>
     <ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
     <AndroidPackageFormat>apk</AndroidPackageFormat>

src/PostIt/PostIt.Tests/AndroidAppLaunchTests.cs

@@ -14,7 +14,7 @@ namespace PostIt.Tests;
 /// </summary>
 public class AndroidAppLaunchTests
 {
-    private const string PackageName = "com.CompanyName.PostIt";
+    private const string PackageName = "fr.pschneider.PostIt";
 
     private readonly ITestOutputHelper _output;
 

src/PostIt/PostIt.Tests/PostIt.Tests.csproj

@@ -21,7 +21,7 @@
     <PackageReference Include="Avalonia.Headless.XUnit" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\PostIt\PostIt\PostIt.csproj" />
+    <ProjectReference Include="..\PostIt\PostIt.csproj" />
   </ItemGroup>
   <ItemGroup>
     <Using Include="Xunit" />

src/PostIt/PostIt/Views/AddCircleMemberDialog.axaml.cs

@@ -1,9 +1,10 @@
-using Avalonia.Controls;
+
 using Avalonia.Markup.Xaml;
 using Avalonia.Interactivity;
 using Avalonia.VisualTree;
 using PostIt.Services;
 using PostIt.ViewModels;
+using System.Threading.Tasks;
 
 namespace PostIt.Views;
 
@@ -19,7 +20,7 @@ namespace PostIt.Views;
 /// circle id. The dialog itself does not know the circle id
 /// by design.</para>
 /// </summary>
-public partial class AddCircleMemberDialog : ContentPage
+public partial class AddCircleMemberDialog : Avalonia.Controls.ContentPage
 {
     public AddCircleMemberDialog()
     {
@@ -41,10 +42,9 @@ public partial class AddCircleMemberDialog : ContentPage
     public AddCircleMemberDialogViewModel? ViewModel
         => DataContext as AddCircleMemberDialogViewModel;
 
-    private void OnCloseClicked(object? sender, RoutedEventArgs e)
+    private async Task OnCloseClicked(object? sender, RoutedEventArgs e)
     {
-        var nav = this.FindAncestorOfType<NavigationPage>();
+        App app = App.Current! as App;
-        if (nav is not null)
+        await app!.GoBackAsync();
-            _ = nav.PopAsync();
     }
 }

yavsc.sln

@@ -37,7 +37,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yavsc.Tests.Shared", "src\Y
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yavsc.Api.Client", "src\Yavsc.Api.Client\Yavsc.Api.Client.csproj", "{59AF5DEA-D349-495A-BC44-FC7BD4E55099}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PostIt.Tests", "src\PostIt.Tests\PostIt.Tests.csproj", "{838B9737-88CA-432E-835C-F96817CF8085}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PostIt.Tests", "src\PostIt\PostIt.Tests\PostIt.Tests.csproj", "{021E6F5A-B81D-42A7-9918-DFE39B424FC2}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -217,18 +217,18 @@ Global
 		{59AF5DEA-D349-495A-BC44-FC7BD4E55099}.Release|x64.Build.0 = Release|Any CPU
 		{59AF5DEA-D349-495A-BC44-FC7BD4E55099}.Release|x86.ActiveCfg = Release|Any CPU
 		{59AF5DEA-D349-495A-BC44-FC7BD4E55099}.Release|x86.Build.0 = Release|Any CPU
-		{838B9737-88CA-432E-835C-F96817CF8085}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{021E6F5A-B81D-42A7-9918-DFE39B424FC2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{838B9737-88CA-432E-835C-F96817CF8085}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{021E6F5A-B81D-42A7-9918-DFE39B424FC2}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{838B9737-88CA-432E-835C-F96817CF8085}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{021E6F5A-B81D-42A7-9918-DFE39B424FC2}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{838B9737-88CA-432E-835C-F96817CF8085}.Debug|x64.Build.0 = Debug|Any CPU
+		{021E6F5A-B81D-42A7-9918-DFE39B424FC2}.Debug|x64.Build.0 = Debug|Any CPU
-		{838B9737-88CA-432E-835C-F96817CF8085}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{021E6F5A-B81D-42A7-9918-DFE39B424FC2}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{838B9737-88CA-432E-835C-F96817CF8085}.Debug|x86.Build.0 = Debug|Any CPU
+		{021E6F5A-B81D-42A7-9918-DFE39B424FC2}.Debug|x86.Build.0 = Debug|Any CPU
-		{838B9737-88CA-432E-835C-F96817CF8085}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{021E6F5A-B81D-42A7-9918-DFE39B424FC2}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{838B9737-88CA-432E-835C-F96817CF8085}.Release|Any CPU.Build.0 = Release|Any CPU
+		{021E6F5A-B81D-42A7-9918-DFE39B424FC2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{838B9737-88CA-432E-835C-F96817CF8085}.Release|x64.ActiveCfg = Release|Any CPU
+		{021E6F5A-B81D-42A7-9918-DFE39B424FC2}.Release|x64.ActiveCfg = Release|Any CPU
-		{838B9737-88CA-432E-835C-F96817CF8085}.Release|x64.Build.0 = Release|Any CPU
+		{021E6F5A-B81D-42A7-9918-DFE39B424FC2}.Release|x64.Build.0 = Release|Any CPU
-		{838B9737-88CA-432E-835C-F96817CF8085}.Release|x86.ActiveCfg = Release|Any CPU
+		{021E6F5A-B81D-42A7-9918-DFE39B424FC2}.Release|x86.ActiveCfg = Release|Any CPU
-		{838B9737-88CA-432E-835C-F96817CF8085}.Release|x86.Build.0 = Release|Any CPU
+		{021E6F5A-B81D-42A7-9918-DFE39B424FC2}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -249,6 +249,6 @@ Global
 		{0E471075-DABF-40E9-98B7-1630BEF19145} = {CDB1BDB5-53F9-4B43-864F-60F2E74F44E2}
 		{34D1F73D-BF74-47CC-9358-9F4F221C75D7} = {CDB1BDB5-53F9-4B43-864F-60F2E74F44E2}
 		{59AF5DEA-D349-495A-BC44-FC7BD4E55099} = {CDB1BDB5-53F9-4B43-864F-60F2E74F44E2}
-		{838B9737-88CA-432E-835C-F96817CF8085} = {CDB1BDB5-53F9-4B43-864F-60F2E74F44E2}
+		{021E6F5A-B81D-42A7-9918-DFE39B424FC2} = {E13D107F-4053-D0DE-6394-453609595BFE}
 	EndGlobalSection
 EndGlobal