From 961afaac59285901b6444c5c5ce62b16092db1d8 Mon Sep 17 00:00:00 2001
From: jbe2277 <jbe2277@users.noreply.github.com>
Date: Wed, 13 May 2026 22:14:47 +0200
Subject: [PATCH 01/21] NR/iOS: Adapt build to upload simulator app

---
 .github/workflows/NewsReader.CI.yml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/NewsReader.CI.yml b/.github/workflows/NewsReader.CI.yml
index 98c8e3d3..0173ced1 100644
--- a/.github/workflows/NewsReader.CI.yml
+++ b/.github/workflows/NewsReader.CI.yml
@@ -180,7 +180,15 @@ jobs:
     - name: 🛠️ Build
       run: |
         cd src/NewsReader/NewsReader.MauiSystem
-        dotnet build -f net10.0-ios -c:Release /p:packageApp=false /p:buildForSimulator=true /p:ArchiveOnBuild=false -p:ApplicationVersion=${{ needs.GetVersion.outputs.version }} -p:ApplicationDisplayVersion=${{ needs.GetVersion.outputs.version }}
+        dotnet publish -f net10.0-ios -c:Release /p:packageApp=true /p:buildForSimulator=true /p:ArchiveOnBuild=false -p:ApplicationVersion=${{ needs.GetVersion.outputs.version }} -p:ApplicationDisplayVersion=${{ needs.GetVersion.outputs.version }}
+
+    - name: 📦 Upload iOS App for simulator
+      uses: actions/upload-artifact@v6
+      with:
+        name: NewsReaderiOSSimulator
+        if-no-files-found: error
+        path: |
+          ./**/publish/*.app
         
   Test:
     runs-on: windows-2025

From 16a193f4227df6fa28dadb0b1c362406afc7bcf9 Mon Sep 17 00:00:00 2001
From: jbe2277 <jbe2277@users.noreply.github.com>
Date: Wed, 13 May 2026 22:24:52 +0200
Subject: [PATCH 02/21] Update iOS simulator build to use iossimulator-arm64

Set RuntimeIdentifier to iossimulator-arm64 in the build step and remove unnecessary publish parameters. This streamlines the configuration and improves compatibility with ARM64-based iOS simulators.
---
 .github/workflows/NewsReader.CI.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/NewsReader.CI.yml b/.github/workflows/NewsReader.CI.yml
index 0173ced1..a72f097e 100644
--- a/.github/workflows/NewsReader.CI.yml
+++ b/.github/workflows/NewsReader.CI.yml
@@ -180,7 +180,7 @@ jobs:
     - name: 🛠️ Build
       run: |
         cd src/NewsReader/NewsReader.MauiSystem
-        dotnet publish -f net10.0-ios -c:Release /p:packageApp=true /p:buildForSimulator=true /p:ArchiveOnBuild=false -p:ApplicationVersion=${{ needs.GetVersion.outputs.version }} -p:ApplicationDisplayVersion=${{ needs.GetVersion.outputs.version }}
+        dotnet publish -f net10.0-ios -c:Release -p:RuntimeIdentifier=iossimulator-arm64 -p:ApplicationVersion=${{ needs.GetVersion.outputs.version }} -p:ApplicationDisplayVersion=${{ needs.GetVersion.outputs.version }}
 
     - name: 📦 Upload iOS App for simulator
       uses: actions/upload-artifact@v6

From 0030f4107f8495461f6dd783d8d939328edd1ffb Mon Sep 17 00:00:00 2001
From: jbe2277 <jbe2277@users.noreply.github.com>
Date: Wed, 13 May 2026 22:30:49 +0200
Subject: [PATCH 03/21] Update iOS build step and artifact upload path

Switched from dotnet publish to dotnet build for the iOS simulator target in the CI workflow. Updated the artifact upload path to include .app files from the bin/Release/net10.0-ios/iossimulator-arm64 directory.
---
 .github/workflows/NewsReader.CI.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/NewsReader.CI.yml b/.github/workflows/NewsReader.CI.yml
index a72f097e..d7eea6e5 100644
--- a/.github/workflows/NewsReader.CI.yml
+++ b/.github/workflows/NewsReader.CI.yml
@@ -180,7 +180,7 @@ jobs:
     - name: 🛠️ Build
       run: |
         cd src/NewsReader/NewsReader.MauiSystem
-        dotnet publish -f net10.0-ios -c:Release -p:RuntimeIdentifier=iossimulator-arm64 -p:ApplicationVersion=${{ needs.GetVersion.outputs.version }} -p:ApplicationDisplayVersion=${{ needs.GetVersion.outputs.version }}
+        dotnet build -f net10.0-ios -c:Release -p:RuntimeIdentifier=iossimulator-arm64 -p:ApplicationVersion=${{ needs.GetVersion.outputs.version }} -p:ApplicationDisplayVersion=${{ needs.GetVersion.outputs.version }}
 
     - name: 📦 Upload iOS App for simulator
       uses: actions/upload-artifact@v6
@@ -188,7 +188,7 @@ jobs:
         name: NewsReaderiOSSimulator
         if-no-files-found: error
         path: |
-          ./**/publish/*.app
+          ./**/bin/Release/net10.0-ios/iossimulator-arm64/**/*.app
         
   Test:
     runs-on: windows-2025

From f07353d262fe1499b13a5aff70afa3df5d6e5ce5 Mon Sep 17 00:00:00 2001
From: jbe2277 <jbe2277@users.noreply.github.com>
Date: Wed, 13 May 2026 22:44:36 +0200
Subject: [PATCH 04/21] Remove MtouchLink workaround for Xamarin issue

---
 .../NewsReader.MauiSystem/NewsReader.MauiSystem.csproj         | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/NewsReader/NewsReader.MauiSystem/NewsReader.MauiSystem.csproj b/src/NewsReader/NewsReader.MauiSystem/NewsReader.MauiSystem.csproj
index 50d4faa8..4bb68bc0 100644
--- a/src/NewsReader/NewsReader.MauiSystem/NewsReader.MauiSystem.csproj
+++ b/src/NewsReader/NewsReader.MauiSystem/NewsReader.MauiSystem.csproj
@@ -21,9 +21,6 @@
     <MauiEnableXamlCBindingWithSourceCompilation>true</MauiEnableXamlCBindingWithSourceCompilation>
 
     <WindowsAppSDKSelfContained>True</WindowsAppSDKSelfContained>
-
-    <!-- Workaround for https://github.com/xamarin/xamarin-macios/issues/21013 -->
-    <MtouchLink>SdkOnly</MtouchLink>
   </PropertyGroup>
 
   <!--TODO: Workaround for https://github.com/microsoft/WindowsAppSDK/issues/3337; 

From f9c833ce35f72115f58d3b9914794ca2271824a2 Mon Sep 17 00:00:00 2001
From: jbe2277 <jbe2277@users.noreply.github.com>
Date: Thu, 14 May 2026 10:34:38 +0200
Subject: [PATCH 05/21] Update artifact upload path for iOS simulator app

---
 .github/workflows/NewsReader.CI.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/NewsReader.CI.yml b/.github/workflows/NewsReader.CI.yml
index d7eea6e5..afc24e0e 100644
--- a/.github/workflows/NewsReader.CI.yml
+++ b/.github/workflows/NewsReader.CI.yml
@@ -188,7 +188,7 @@ jobs:
         name: NewsReaderiOSSimulator
         if-no-files-found: error
         path: |
-          ./**/bin/Release/net10.0-ios/iossimulator-arm64/**/*.app
+          ./**/bin/Release/*/iossimulator-arm64/NewsReader.MauiSystem.app/**
         
   Test:
     runs-on: windows-2025

From becae0f6840375be2940016a66479eb3466e6855 Mon Sep 17 00:00:00 2001
From: jbe2277 <jbe2277@users.noreply.github.com>
Date: Thu, 14 May 2026 11:19:43 +0200
Subject: [PATCH 06/21] adapt path

---
 .github/workflows/NewsReader.CI.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/NewsReader.CI.yml b/.github/workflows/NewsReader.CI.yml
index afc24e0e..6af7295c 100644
--- a/.github/workflows/NewsReader.CI.yml
+++ b/.github/workflows/NewsReader.CI.yml
@@ -188,7 +188,7 @@ jobs:
         name: NewsReaderiOSSimulator
         if-no-files-found: error
         path: |
-          ./**/bin/Release/*/iossimulator-arm64/NewsReader.MauiSystem.app/**
+          ./src/NewsReader/NewsReader.MauiSystem/bin/Release/*/iossimulator-arm64/NewsReader.MauiSystem.app/**
         
   Test:
     runs-on: windows-2025

From daf0b55ad24a027852da3d974229a6ca860cdc41 Mon Sep 17 00:00:00 2001
From: jbe2277 <jbe2277@users.noreply.github.com>
Date: Thu, 14 May 2026 11:45:26 +0200
Subject: [PATCH 07/21] go

---
 .github/workflows/NewsReader.UITestIOS.yml | 80 ++++++++++++++++++++++
 1 file changed, 80 insertions(+)
 create mode 100644 .github/workflows/NewsReader.UITestIOS.yml

diff --git a/.github/workflows/NewsReader.UITestIOS.yml b/.github/workflows/NewsReader.UITestIOS.yml
new file mode 100644
index 00000000..79647a33
--- /dev/null
+++ b/.github/workflows/NewsReader.UITestIOS.yml
@@ -0,0 +1,80 @@
+name: NewsReader.UITestIOS
+
+on: 
+  workflow_run:
+    workflows: ["NewsReader.CI"]
+    types:
+    - completed
+
+  workflow_dispatch:
+
+jobs:
+  UITest:    
+    if: ${{ github.event_name != 'workflow_run' || github.event.workflow_run.conclusion == 'success' }}
+    runs-on: macos-26
+    
+    steps:
+    - name: 🔖 Check-out
+      uses: actions/checkout@v6
+
+    - name: 📜 Authenticate GitHub CLI
+      run: echo "${{ secrets.GITHUB_TOKEN }}" | gh auth login --with-token
+
+    - name: ⚙️ Get latest successful run ID
+      id: get_run
+      run: |
+        RUN_ID=$(gh run list \
+          --workflow="NewsReader.CI.yml" \
+          --branch=BuildPublishIosApp \
+          --json databaseId,status,conclusion \
+          --jq '.[] | select(.conclusion=="success") | .databaseId' \
+          | head -n 1)
+        echo "run_id=$RUN_ID" >> $GITHUB_OUTPUT
+        echo "run_id=$RUN_ID"
+
+    - name: 📦 Download Simulator App
+      run: |
+        gh run download ${{ steps.get_run.outputs.run_id }} --name="NewsReaderiOSSimulator" --dir=./NewsReaderiOSSimulator
+
+    - name: Show available simulators
+      run: xcrun simctl list devices available
+
+    - name: Create and boot simulator
+      run: |
+        DEVICE_TYPE="com.apple.CoreSimulator.SimDeviceType.iPhone-17"
+        RUNTIME=$(xcrun simctl list runtimes | grep 'iOS 26.4' | grep -o 'com.apple.CoreSimulator.SimRuntime.iOS-[0-9-]*' | head -1)
+        UDID=$(xcrun simctl create "CI iPhone" "$DEVICE_TYPE" "$RUNTIME")
+        echo "SIMULATOR_UDID=$UDID" >> "$GITHUB_ENV"
+        xcrun simctl boot "$UDID"
+        xcrun simctl bootstatus "$UDID" -b
+
+    - name: Show booted simulator
+      run: xcrun simctl list devices | grep Booted
+
+    - name: ⚙️ Install Appium Server
+      run: |
+        npm install appium -g
+        appium driver install xcuitest
+        appium --version
+
+    - name: ⚙️ Start Appium Server
+      run: |
+        mkdir -p $GITHUB_WORKSPACE/out/NewsReader.UITest
+        appium > $GITHUB_WORKSPACE/out/NewsReader.UITest/appium.log 2>&1 &
+
+    - name: 🖥️ UI Test
+      env:
+        UITestApkFile: NewsReaderAndroid/src/NewsReader/NewsReader.MauiSystem/bin/Release/net10.0-android/publish/Waf.NewsReader-Signed.apk
+      run: |
+        echo "## 🕵️ Test Results - NewsReader.UITest.sln" >> $Env:GITHUB_STEP_SUMMARY        
+        cd ./src/NewsReader.UITest
+        dotnet test --solution ./NewsReader.UITest.slnx --filter-trait DevicePlatform=Android
+
+    - name: 📦 Upload UI Test results
+      uses: actions/upload-artifact@v6
+      if: always()
+      with:
+        name: NewsReaderUITestResults
+        if-no-files-found: ignore
+        path: |
+          out/NewsReader.UITest/

From f101443a916eae3880319264e9d5dd1953b5fd9a Mon Sep 17 00:00:00 2001
From: jbe2277 <jbe2277@users.noreply.github.com>
Date: Thu, 14 May 2026 17:40:41 +0200
Subject: [PATCH 08/21] ios-4

---
 .github/workflows/NewsReader.UITestIOS.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/NewsReader.UITestIOS.yml b/.github/workflows/NewsReader.UITestIOS.yml
index 79647a33..2e41cbe1 100644
--- a/.github/workflows/NewsReader.UITestIOS.yml
+++ b/.github/workflows/NewsReader.UITestIOS.yml
@@ -1,6 +1,10 @@
 name: NewsReader.UITestIOS
 
 on: 
+  push:
+    paths: 
+    - '**/NewsReader.UITestIOS.yml'
+
   workflow_run:
     workflows: ["NewsReader.CI"]
     types:

From d04182c64bb2ac7643e40b8e74bea542104c14df Mon Sep 17 00:00:00 2001
From: jbe2277 <jbe2277@users.noreply.github.com>
Date: Thu, 14 May 2026 18:00:55 +0200
Subject: [PATCH 09/21] c

---
 .github/workflows/NewsReader.UITestIOS.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/NewsReader.UITestIOS.yml b/.github/workflows/NewsReader.UITestIOS.yml
index 2e41cbe1..c0f461d1 100644
--- a/.github/workflows/NewsReader.UITestIOS.yml
+++ b/.github/workflows/NewsReader.UITestIOS.yml
@@ -43,7 +43,7 @@ jobs:
     - name: Show available simulators
       run: xcrun simctl list devices available
 
-    - name: Create and boot simulator
+    - name: Create and boot simulator and install and launch App
       run: |
         DEVICE_TYPE="com.apple.CoreSimulator.SimDeviceType.iPhone-17"
         RUNTIME=$(xcrun simctl list runtimes | grep 'iOS 26.4' | grep -o 'com.apple.CoreSimulator.SimRuntime.iOS-[0-9-]*' | head -1)
@@ -51,6 +51,8 @@ jobs:
         echo "SIMULATOR_UDID=$UDID" >> "$GITHUB_ENV"
         xcrun simctl boot "$UDID"
         xcrun simctl bootstatus "$UDID" -b
+        xcrun simctl install "$UDID" NewsReaderiOSSimulator/src/NewsReader/NewsReader.MauiSystem/bin/Release/net10.0-ios/iossimulator-arm64/NewsReader.MauiSystem.app
+        xcrun simctl launch "$UDID" Waf.NewsReader
 
     - name: Show booted simulator
       run: xcrun simctl list devices | grep Booted

From 14348ebfd654f7a0bbd5a5c709e878ffd4eb087f Mon Sep 17 00:00:00 2001
From: jbe2277 <jbe2277@users.noreply.github.com>
Date: Thu, 14 May 2026 19:40:53 +0200
Subject: [PATCH 10/21] d

---
 .github/workflows/NewsReader.UITestIOS.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/NewsReader.UITestIOS.yml b/.github/workflows/NewsReader.UITestIOS.yml
index c0f461d1..d3dbb72f 100644
--- a/.github/workflows/NewsReader.UITestIOS.yml
+++ b/.github/workflows/NewsReader.UITestIOS.yml
@@ -51,6 +51,7 @@ jobs:
         echo "SIMULATOR_UDID=$UDID" >> "$GITHUB_ENV"
         xcrun simctl boot "$UDID"
         xcrun simctl bootstatus "$UDID" -b
+        ls -la ./
         xcrun simctl install "$UDID" NewsReaderiOSSimulator/src/NewsReader/NewsReader.MauiSystem/bin/Release/net10.0-ios/iossimulator-arm64/NewsReader.MauiSystem.app
         xcrun simctl launch "$UDID" Waf.NewsReader
 

From 84291160dd05bd23667b0650b054cf95afa8b715 Mon Sep 17 00:00:00 2001
From: jbe2277 <jbe2277@users.noreply.github.com>
Date: Thu, 14 May 2026 19:44:37 +0200
Subject: [PATCH 11/21] z

---
 .github/workflows/NewsReader.UITestIOS.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/NewsReader.UITestIOS.yml b/.github/workflows/NewsReader.UITestIOS.yml
index d3dbb72f..da80a6ea 100644
--- a/.github/workflows/NewsReader.UITestIOS.yml
+++ b/.github/workflows/NewsReader.UITestIOS.yml
@@ -51,7 +51,7 @@ jobs:
         echo "SIMULATOR_UDID=$UDID" >> "$GITHUB_ENV"
         xcrun simctl boot "$UDID"
         xcrun simctl bootstatus "$UDID" -b
-        ls -la ./
+        ls -la ./NewsReaderiOSSimulator
         xcrun simctl install "$UDID" NewsReaderiOSSimulator/src/NewsReader/NewsReader.MauiSystem/bin/Release/net10.0-ios/iossimulator-arm64/NewsReader.MauiSystem.app
         xcrun simctl launch "$UDID" Waf.NewsReader
 

From 805872c05a275a0d920510ec0747b680dcad2446 Mon Sep 17 00:00:00 2001
From: jbe2277 <jbe2277@users.noreply.github.com>
Date: Thu, 14 May 2026 19:51:41 +0200
Subject: [PATCH 12/21] y

---
 .github/workflows/NewsReader.UITestIOS.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/NewsReader.UITestIOS.yml b/.github/workflows/NewsReader.UITestIOS.yml
index da80a6ea..fdfbab15 100644
--- a/.github/workflows/NewsReader.UITestIOS.yml
+++ b/.github/workflows/NewsReader.UITestIOS.yml
@@ -51,8 +51,8 @@ jobs:
         echo "SIMULATOR_UDID=$UDID" >> "$GITHUB_ENV"
         xcrun simctl boot "$UDID"
         xcrun simctl bootstatus "$UDID" -b
-        ls -la ./NewsReaderiOSSimulator
-        xcrun simctl install "$UDID" NewsReaderiOSSimulator/src/NewsReader/NewsReader.MauiSystem/bin/Release/net10.0-ios/iossimulator-arm64/NewsReader.MauiSystem.app
+        ls -la ./NewsReaderiOSSimulator/net10.0-ios/iossimulator-arm64/NewsReader.MauiSystem.app
+        xcrun simctl install "$UDID" NewsReaderiOSSimulator/net10.0-ios/iossimulator-arm64/NewsReader.MauiSystem.app
         xcrun simctl launch "$UDID" Waf.NewsReader
 
     - name: Show booted simulator

From cb0b6d731ebc2371a811f52ae0349e88442eaca3 Mon Sep 17 00:00:00 2001
From: jbe2277 <jbe2277@users.noreply.github.com>
Date: Thu, 14 May 2026 22:17:10 +0200
Subject: [PATCH 13/21] x

---
 .github/workflows/NewsReader.UITestIOS.yml | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/NewsReader.UITestIOS.yml b/.github/workflows/NewsReader.UITestIOS.yml
index fdfbab15..01af704f 100644
--- a/.github/workflows/NewsReader.UITestIOS.yml
+++ b/.github/workflows/NewsReader.UITestIOS.yml
@@ -40,10 +40,10 @@ jobs:
       run: |
         gh run download ${{ steps.get_run.outputs.run_id }} --name="NewsReaderiOSSimulator" --dir=./NewsReaderiOSSimulator
 
-    - name: Show available simulators
+    - name: ⚙️ Show available simulators
       run: xcrun simctl list devices available
 
-    - name: Create and boot simulator and install and launch App
+    - name: ⚙️ Create and boot simulator and install app
       run: |
         DEVICE_TYPE="com.apple.CoreSimulator.SimDeviceType.iPhone-17"
         RUNTIME=$(xcrun simctl list runtimes | grep 'iOS 26.4' | grep -o 'com.apple.CoreSimulator.SimRuntime.iOS-[0-9-]*' | head -1)
@@ -51,12 +51,7 @@ jobs:
         echo "SIMULATOR_UDID=$UDID" >> "$GITHUB_ENV"
         xcrun simctl boot "$UDID"
         xcrun simctl bootstatus "$UDID" -b
-        ls -la ./NewsReaderiOSSimulator/net10.0-ios/iossimulator-arm64/NewsReader.MauiSystem.app
-        xcrun simctl install "$UDID" NewsReaderiOSSimulator/net10.0-ios/iossimulator-arm64/NewsReader.MauiSystem.app
-        xcrun simctl launch "$UDID" Waf.NewsReader
-
-    - name: Show booted simulator
-      run: xcrun simctl list devices | grep Booted
+        xcrun simctl install "$UDID" NewsReaderiOSSimulator/net10.0-ios/iossimulator-arm64/NewsReader.MauiSystem.app        
 
     - name: ⚙️ Install Appium Server
       run: |
@@ -70,12 +65,10 @@ jobs:
         appium > $GITHUB_WORKSPACE/out/NewsReader.UITest/appium.log 2>&1 &
 
     - name: 🖥️ UI Test
-      env:
-        UITestApkFile: NewsReaderAndroid/src/NewsReader/NewsReader.MauiSystem/bin/Release/net10.0-android/publish/Waf.NewsReader-Signed.apk
       run: |
-        echo "## 🕵️ Test Results - NewsReader.UITest.sln" >> $Env:GITHUB_STEP_SUMMARY        
+        echo "## 🕵️ Test Results - NewsReader.UITest.sln" >> $Env:GITHUB_STEP_SUMMARY
         cd ./src/NewsReader.UITest
-        dotnet test --solution ./NewsReader.UITest.slnx --filter-trait DevicePlatform=Android
+        dotnet test --solution ./NewsReader.UITest.slnx --filter-trait DevicePlatform=IOS
 
     - name: 📦 Upload UI Test results
       uses: actions/upload-artifact@v6

From 845a9d639163e8e02b8c1f99ebe4a183252d65a2 Mon Sep 17 00:00:00 2001
From: jbe2277 <jbe2277@users.noreply.github.com>
Date: Thu, 14 May 2026 22:42:44 +0200
Subject: [PATCH 14/21] w

---
 .github/workflows/NewsReader.UITestIOS.yml        | 2 ++
 src/NewsReader.UITest/NewsReader.UITest/UITest.cs | 1 +
 src/NewsReader.UITest/UITest.Core/UITestBase.cs   | 9 +++++++--
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/NewsReader.UITestIOS.yml b/.github/workflows/NewsReader.UITestIOS.yml
index 01af704f..016815a0 100644
--- a/.github/workflows/NewsReader.UITestIOS.yml
+++ b/.github/workflows/NewsReader.UITestIOS.yml
@@ -65,6 +65,8 @@ jobs:
         appium > $GITHUB_WORKSPACE/out/NewsReader.UITest/appium.log 2>&1 &
 
     - name: 🖥️ UI Test
+      env:
+        UITestApp: NewsReaderiOSSimulator/net10.0-ios/iossimulator-arm64/NewsReader.MauiSystem.app
       run: |
         echo "## 🕵️ Test Results - NewsReader.UITest.sln" >> $Env:GITHUB_STEP_SUMMARY
         cd ./src/NewsReader.UITest
diff --git a/src/NewsReader.UITest/NewsReader.UITest/UITest.cs b/src/NewsReader.UITest/NewsReader.UITest/UITest.cs
index 42b4e4b8..739cbde7 100644
--- a/src/NewsReader.UITest/NewsReader.UITest/UITest.cs
+++ b/src/NewsReader.UITest/NewsReader.UITest/UITest.cs
@@ -5,6 +5,7 @@ namespace UITest.NewsReader;
 public class UITest() : UITestBase("Waf.NewsReader",        
         androidApkFile: Environment.GetEnvironmentVariable("UITestApkFile") ?? "src/NewsReader/NewsReader.MauiSystem/bin/Release/net10.0-android/Waf.NewsReader-Signed.apk",
         androidAppActivity: "Waf.NewsReader.MainActivity",
+        iosApp: Environment.GetEnvironmentVariable("UITestApp"),
         windowsAppId: "Waf.NewsReader_a8txtqew917ny!App",
         Environment.GetEnvironmentVariable("UITestOutputPath") ?? "out/NewsReader.UITest/")
 {
diff --git a/src/NewsReader.UITest/UITest.Core/UITestBase.cs b/src/NewsReader.UITest/UITest.Core/UITestBase.cs
index 0662a9fa..54218e9b 100644
--- a/src/NewsReader.UITest/UITest.Core/UITestBase.cs
+++ b/src/NewsReader.UITest/UITest.Core/UITestBase.cs
@@ -16,7 +16,7 @@ public abstract class UITestBase : IDisposable
     private readonly string rootPath;
     private readonly string testOutPath;
 
-    protected UITestBase(string appId, string androidApkFile, string androidAppActivity, string windowsAppId, string testOutputPath)
+    protected UITestBase(string appId, string androidApkFile, string androidAppActivity, string? iosApp, string windowsAppId, string testOutputPath)
     {
         var devicePlatform = DeviceManager.GetDevicePlatform(GetType());
 
@@ -29,7 +29,7 @@ protected UITestBase(string appId, string androidApkFile, string androidAppActiv
         app = devicePlatform switch
         {
             DevicePlatform.Android => androidApkFile,
-            DevicePlatform.IOS => "",
+            DevicePlatform.IOS => iosApp ?? "",
             DevicePlatform.Windows => windowsAppId,
             _ => throw new NotSupportedException()
         };
@@ -89,6 +89,11 @@ private IOSDriver SetupIOS(Uri serverUri)
             AutomationName = AutomationName.iOSXcuiTest,
             PlatformName = MobilePlatform.IOS,
         };
+        if (!string.IsNullOrEmpty(app))
+        {
+            var appPath = Path.GetFullPath(Path.IsPathFullyQualified(app) ? app : Path.Combine(rootPath, app));
+            driverOptions.App = appPath;
+        }
         driverOptions.AddAdditionalAppiumOption("bundleId", appId);
 
         // TODO: Use this if you have a physical device

From 1dc004a4a3c296f0d0ca977b1fff5ecae9ea6423 Mon Sep 17 00:00:00 2001
From: jbe2277 <jbe2277@users.noreply.github.com>
Date: Thu, 14 May 2026 22:54:11 +0200
Subject: [PATCH 15/21] v

---
 .github/workflows/NewsReader.UITestIOS.yml | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/NewsReader.UITestIOS.yml b/.github/workflows/NewsReader.UITestIOS.yml
index 016815a0..2069315e 100644
--- a/.github/workflows/NewsReader.UITestIOS.yml
+++ b/.github/workflows/NewsReader.UITestIOS.yml
@@ -40,18 +40,18 @@ jobs:
       run: |
         gh run download ${{ steps.get_run.outputs.run_id }} --name="NewsReaderiOSSimulator" --dir=./NewsReaderiOSSimulator
 
-    - name: ⚙️ Show available simulators
-      run: xcrun simctl list devices available
+    # - name: ⚙️ Show available simulators
+    #   run: xcrun simctl list devices available
 
-    - name: ⚙️ Create and boot simulator and install app
-      run: |
-        DEVICE_TYPE="com.apple.CoreSimulator.SimDeviceType.iPhone-17"
-        RUNTIME=$(xcrun simctl list runtimes | grep 'iOS 26.4' | grep -o 'com.apple.CoreSimulator.SimRuntime.iOS-[0-9-]*' | head -1)
-        UDID=$(xcrun simctl create "CI iPhone" "$DEVICE_TYPE" "$RUNTIME")
-        echo "SIMULATOR_UDID=$UDID" >> "$GITHUB_ENV"
-        xcrun simctl boot "$UDID"
-        xcrun simctl bootstatus "$UDID" -b
-        xcrun simctl install "$UDID" NewsReaderiOSSimulator/net10.0-ios/iossimulator-arm64/NewsReader.MauiSystem.app        
+    # - name: ⚙️ Create and boot simulator and install app
+    #   run: |
+    #     DEVICE_TYPE="com.apple.CoreSimulator.SimDeviceType.iPhone-17"
+    #     RUNTIME=$(xcrun simctl list runtimes | grep 'iOS 26.4' | grep -o 'com.apple.CoreSimulator.SimRuntime.iOS-[0-9-]*' | head -1)
+    #     UDID=$(xcrun simctl create "CI iPhone" "$DEVICE_TYPE" "$RUNTIME")
+    #     echo "SIMULATOR_UDID=$UDID" >> "$GITHUB_ENV"
+    #     xcrun simctl boot "$UDID"
+    #     xcrun simctl bootstatus "$UDID" -b
+    #     xcrun simctl install "$UDID" NewsReaderiOSSimulator/net10.0-ios/iossimulator-arm64/NewsReader.MauiSystem.app        
 
     - name: ⚙️ Install Appium Server
       run: |

From 9cb8fee17bb2d32648ccfff79fa54501883eb937 Mon Sep 17 00:00:00 2001
From: jbe2277 <jbe2277@users.noreply.github.com>
Date: Fri, 15 May 2026 10:19:09 +0200
Subject: [PATCH 16/21] r

---
 src/NewsReader.UITest/UITest.Core/UITestBase.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/NewsReader.UITest/UITest.Core/UITestBase.cs b/src/NewsReader.UITest/UITest.Core/UITestBase.cs
index 54218e9b..40aaaff5 100644
--- a/src/NewsReader.UITest/UITest.Core/UITestBase.cs
+++ b/src/NewsReader.UITest/UITest.Core/UITestBase.cs
@@ -95,6 +95,7 @@ private IOSDriver SetupIOS(Uri serverUri)
             driverOptions.App = appPath;
         }
         driverOptions.AddAdditionalAppiumOption("bundleId", appId);
+        driverOptions.AddAdditionalAppiumOption("wdaLaunchTimeout", 180_000);
 
         // TODO: Use this if you have a physical device
         //driverOptions.AddAdditionalAppiumOption(MobileCapabilityType.Udid, "");

From 7e96d67d9b53eb0d02a071f45d3767f07da68e60 Mon Sep 17 00:00:00 2001
From: jbe2277 <jbe2277@users.noreply.github.com>
Date: Fri, 15 May 2026 10:23:24 +0200
Subject: [PATCH 17/21] k

---
 .github/workflows/NewsReader.UITestIOS.yml      | 2 +-
 src/NewsReader.UITest/UITest.Core/UITestBase.cs | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/NewsReader.UITestIOS.yml b/.github/workflows/NewsReader.UITestIOS.yml
index 2069315e..e3b036f1 100644
--- a/.github/workflows/NewsReader.UITestIOS.yml
+++ b/.github/workflows/NewsReader.UITestIOS.yml
@@ -51,7 +51,7 @@ jobs:
     #     echo "SIMULATOR_UDID=$UDID" >> "$GITHUB_ENV"
     #     xcrun simctl boot "$UDID"
     #     xcrun simctl bootstatus "$UDID" -b
-    #     xcrun simctl install "$UDID" NewsReaderiOSSimulator/net10.0-ios/iossimulator-arm64/NewsReader.MauiSystem.app        
+    #     xcrun simctl install "$UDID" NewsReaderiOSSimulator/net10.0-ios/iossimulator-arm64/NewsReader.MauiSystem.app
 
     - name: ⚙️ Install Appium Server
       run: |
diff --git a/src/NewsReader.UITest/UITest.Core/UITestBase.cs b/src/NewsReader.UITest/UITest.Core/UITestBase.cs
index 40aaaff5..c826a7ae 100644
--- a/src/NewsReader.UITest/UITest.Core/UITestBase.cs
+++ b/src/NewsReader.UITest/UITest.Core/UITestBase.cs
@@ -95,7 +95,8 @@ private IOSDriver SetupIOS(Uri serverUri)
             driverOptions.App = appPath;
         }
         driverOptions.AddAdditionalAppiumOption("bundleId", appId);
-        driverOptions.AddAdditionalAppiumOption("wdaLaunchTimeout", 180_000);
+        driverOptions.AddAdditionalAppiumOption("simulatorStartupTimeout", 300_000);   // Increate timeouts for CI, as simulator startup can be slow
+        driverOptions.AddAdditionalAppiumOption("wdaLaunchTimeout", 180_000);          // Increate timeouts for CI, as WebDriverAgent startup can be slow
 
         // TODO: Use this if you have a physical device
         //driverOptions.AddAdditionalAppiumOption(MobileCapabilityType.Udid, "");

From 2a4b2631122e66a5d76096887459caf3635b776d Mon Sep 17 00:00:00 2001
From: jbe2277 <jbe2277@users.noreply.github.com>
Date: Fri, 15 May 2026 12:20:21 +0200
Subject: [PATCH 18/21] j

---
 src/NewsReader.UITest/UITest.Core/UITestBase.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/NewsReader.UITest/UITest.Core/UITestBase.cs b/src/NewsReader.UITest/UITest.Core/UITestBase.cs
index c826a7ae..23e7a0a5 100644
--- a/src/NewsReader.UITest/UITest.Core/UITestBase.cs
+++ b/src/NewsReader.UITest/UITest.Core/UITestBase.cs
@@ -95,8 +95,8 @@ private IOSDriver SetupIOS(Uri serverUri)
             driverOptions.App = appPath;
         }
         driverOptions.AddAdditionalAppiumOption("bundleId", appId);
-        driverOptions.AddAdditionalAppiumOption("simulatorStartupTimeout", 300_000);   // Increate timeouts for CI, as simulator startup can be slow
-        driverOptions.AddAdditionalAppiumOption("wdaLaunchTimeout", 180_000);          // Increate timeouts for CI, as WebDriverAgent startup can be slow
+        driverOptions.AddAdditionalAppiumOption("simulatorStartupTimeout", 300_000);   // Increased timeouts for CI, as simulator startup can be slow
+        driverOptions.AddAdditionalAppiumOption("wdaLaunchTimeout", 300_000);          // Increased timeouts for CI, as WebDriverAgent startup can be slow
 
         // TODO: Use this if you have a physical device
         //driverOptions.AddAdditionalAppiumOption(MobileCapabilityType.Udid, "");
@@ -105,7 +105,7 @@ private IOSDriver SetupIOS(Uri serverUri)
         //driverOptions.AddAdditionalAppiumOption("xcodeOrgId", "");
         //driverOptions.AddAdditionalAppiumOption("xcodeSigningId", "");
 
-        return new(serverUri, driverOptions, TimeSpan.FromMinutes(3));
+        return new(serverUri, driverOptions, TimeSpan.FromMinutes(10));                // Increased timeout for CI, as simulator and WebDriverAgent startup can be slow
     }
 
     private WindowsDriver SetupWindows(Uri serverUri)

From 36e2c06c8ae0fcbedf16ccdb4bfa40c46df813b2 Mon Sep 17 00:00:00 2001
From: jbe2277 <jbe2277@users.noreply.github.com>
Date: Fri, 15 May 2026 12:20:43 +0200
Subject: [PATCH 19/21] j2

---
 .github/workflows/NewsReader.UITestIOS.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/NewsReader.UITestIOS.yml b/.github/workflows/NewsReader.UITestIOS.yml
index e3b036f1..dca04a78 100644
--- a/.github/workflows/NewsReader.UITestIOS.yml
+++ b/.github/workflows/NewsReader.UITestIOS.yml
@@ -40,7 +40,7 @@ jobs:
       run: |
         gh run download ${{ steps.get_run.outputs.run_id }} --name="NewsReaderiOSSimulator" --dir=./NewsReaderiOSSimulator
 
-    # - name: ⚙️ Show available simulators
+    # - name: ⚙️ Show available simulators 
     #   run: xcrun simctl list devices available
 
     # - name: ⚙️ Create and boot simulator and install app

From a0dc9d70ff6933ed6090d2ebd97ed6cb3c53c5c8 Mon Sep 17 00:00:00 2001
From: jbe2277 <jbe2277@users.noreply.github.com>
Date: Fri, 15 May 2026 13:45:22 +0200
Subject: [PATCH 20/21] a

---
 .../workflows/NewsReader.UITestAndroid.yml    |  5 ++++
 .github/workflows/NewsReader.UITestIOS.yml    | 23 ++++++++++---------
 .../NewsReader.UITest/UITest.cs               |  6 +++--
 .../UITest.Core/UITestBase.cs                 |  7 ++++--
 4 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/NewsReader.UITestAndroid.yml b/.github/workflows/NewsReader.UITestAndroid.yml
index 791745be..0a938c42 100644
--- a/.github/workflows/NewsReader.UITestAndroid.yml
+++ b/.github/workflows/NewsReader.UITestAndroid.yml
@@ -1,6 +1,11 @@
 name: NewsReader.UITestAndroid
 
 on: 
+  push:
+    paths: 
+    - '**/NewsReader.UITestAndroid.yml'
+    - 'src/NewsReader.UITest/**'
+
   workflow_run:
     workflows: ["NewsReader.CI"]
     types:
diff --git a/.github/workflows/NewsReader.UITestIOS.yml b/.github/workflows/NewsReader.UITestIOS.yml
index dca04a78..f3897528 100644
--- a/.github/workflows/NewsReader.UITestIOS.yml
+++ b/.github/workflows/NewsReader.UITestIOS.yml
@@ -4,6 +4,7 @@ on:
   push:
     paths: 
     - '**/NewsReader.UITestIOS.yml'
+    - 'src/NewsReader.UITest/**'
 
   workflow_run:
     workflows: ["NewsReader.CI"]
@@ -40,18 +41,18 @@ jobs:
       run: |
         gh run download ${{ steps.get_run.outputs.run_id }} --name="NewsReaderiOSSimulator" --dir=./NewsReaderiOSSimulator
 
-    # - name: ⚙️ Show available simulators 
-    #   run: xcrun simctl list devices available
+    - name: ⚙️ Show available simulators 
+      run: xcrun simctl list devices available
 
-    # - name: ⚙️ Create and boot simulator and install app
-    #   run: |
-    #     DEVICE_TYPE="com.apple.CoreSimulator.SimDeviceType.iPhone-17"
-    #     RUNTIME=$(xcrun simctl list runtimes | grep 'iOS 26.4' | grep -o 'com.apple.CoreSimulator.SimRuntime.iOS-[0-9-]*' | head -1)
-    #     UDID=$(xcrun simctl create "CI iPhone" "$DEVICE_TYPE" "$RUNTIME")
-    #     echo "SIMULATOR_UDID=$UDID" >> "$GITHUB_ENV"
-    #     xcrun simctl boot "$UDID"
-    #     xcrun simctl bootstatus "$UDID" -b
-    #     xcrun simctl install "$UDID" NewsReaderiOSSimulator/net10.0-ios/iossimulator-arm64/NewsReader.MauiSystem.app
+    - name: ⚙️ Create and boot simulator and install app
+      run: |
+        DEVICE_TYPE="com.apple.CoreSimulator.SimDeviceType.iPhone-17"
+        RUNTIME=$(xcrun simctl list runtimes | grep 'iOS 26.4' | grep -o 'com.apple.CoreSimulator.SimRuntime.iOS-[0-9-]*' | head -1)
+        UDID=$(xcrun simctl create "CI iPhone" "$DEVICE_TYPE" "$RUNTIME")
+        echo "UITestDeviceId=$UDID" >> "$GITHUB_ENV"
+        xcrun simctl boot "$UDID"
+        xcrun simctl bootstatus "$UDID" -b
+        xcrun simctl install "$UDID" NewsReaderiOSSimulator/net10.0-ios/iossimulator-arm64/NewsReader.MauiSystem.app
 
     - name: ⚙️ Install Appium Server
       run: |
diff --git a/src/NewsReader.UITest/NewsReader.UITest/UITest.cs b/src/NewsReader.UITest/NewsReader.UITest/UITest.cs
index 739cbde7..51631941 100644
--- a/src/NewsReader.UITest/NewsReader.UITest/UITest.cs
+++ b/src/NewsReader.UITest/NewsReader.UITest/UITest.cs
@@ -2,12 +2,14 @@
 
 namespace UITest.NewsReader;
 
-public class UITest() : UITestBase("Waf.NewsReader",        
+public class UITest() : UITestBase(
+        deviceId: Environment.GetEnvironmentVariable("UITestDeviceId"),
+        appId: "Waf.NewsReader",        
         androidApkFile: Environment.GetEnvironmentVariable("UITestApkFile") ?? "src/NewsReader/NewsReader.MauiSystem/bin/Release/net10.0-android/Waf.NewsReader-Signed.apk",
         androidAppActivity: "Waf.NewsReader.MainActivity",
         iosApp: Environment.GetEnvironmentVariable("UITestApp"),
         windowsAppId: "Waf.NewsReader_a8txtqew917ny!App",
-        Environment.GetEnvironmentVariable("UITestOutputPath") ?? "out/NewsReader.UITest/")
+        testOutputPath: Environment.GetEnvironmentVariable("UITestOutputPath") ?? "out/NewsReader.UITest/")
 {
     public ShellWindow GetShellWindow() => new(Driver);
 }
diff --git a/src/NewsReader.UITest/UITest.Core/UITestBase.cs b/src/NewsReader.UITest/UITest.Core/UITestBase.cs
index 23e7a0a5..ca70a267 100644
--- a/src/NewsReader.UITest/UITest.Core/UITestBase.cs
+++ b/src/NewsReader.UITest/UITest.Core/UITestBase.cs
@@ -10,16 +10,17 @@ namespace UITest;
 
 public abstract class UITestBase : IDisposable
 {
+    private readonly string? deviceId;
     private readonly string appId;
     private readonly string app;
     private readonly string androidAppActivity;
     private readonly string rootPath;
     private readonly string testOutPath;
 
-    protected UITestBase(string appId, string androidApkFile, string androidAppActivity, string? iosApp, string windowsAppId, string testOutputPath)
+    protected UITestBase(string? deviceId, string appId, string androidApkFile, string androidAppActivity, string? iosApp, string windowsAppId, string testOutputPath)
     {
         var devicePlatform = DeviceManager.GetDevicePlatform(GetType());
-
+        this.deviceId = deviceId;
         this.appId = appId;
         this.androidAppActivity = androidAppActivity;
         var assemblyPath = Assembly.GetAssembly(typeof(UITestBase))!.Location;
@@ -34,6 +35,7 @@ protected UITestBase(string appId, string androidApkFile, string androidAppActiv
             _ => throw new NotSupportedException()
         };
         Log.WriteLine(("DevicePlatform:", $"{devicePlatform}"));
+        Log.WriteLine(("DeviceId:", $"{deviceId}"));
         Log.WriteLine(("AppId:", $"{appId}"));
         Log.WriteLine(("App:", $"{app}"));
         Log.WriteLine(("AndroidAppActivity:", $"{androidAppActivity}"));
@@ -94,6 +96,7 @@ private IOSDriver SetupIOS(Uri serverUri)
             var appPath = Path.GetFullPath(Path.IsPathFullyQualified(app) ? app : Path.Combine(rootPath, app));
             driverOptions.App = appPath;
         }
+        if (!string.IsNullOrEmpty(deviceId)) driverOptions.AddAdditionalAppiumOption(MobileCapabilityType.Udid, deviceId);
         driverOptions.AddAdditionalAppiumOption("bundleId", appId);
         driverOptions.AddAdditionalAppiumOption("simulatorStartupTimeout", 300_000);   // Increased timeouts for CI, as simulator startup can be slow
         driverOptions.AddAdditionalAppiumOption("wdaLaunchTimeout", 300_000);          // Increased timeouts for CI, as WebDriverAgent startup can be slow

From 77e457f4da880c87b2c902bd11b6732d64374533 Mon Sep 17 00:00:00 2001
From: jbe2277 <jbe2277@users.noreply.github.com>
Date: Fri, 15 May 2026 14:05:26 +0200
Subject: [PATCH 21/21] o

---
 .github/workflows/NewsReader.UITestIOS.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/NewsReader.UITestIOS.yml b/.github/workflows/NewsReader.UITestIOS.yml
index f3897528..05a576be 100644
--- a/.github/workflows/NewsReader.UITestIOS.yml
+++ b/.github/workflows/NewsReader.UITestIOS.yml
@@ -30,7 +30,7 @@ jobs:
       run: |
         RUN_ID=$(gh run list \
           --workflow="NewsReader.CI.yml" \
-          --branch=BuildPublishIosApp \
+          --branch=master \
           --json databaseId,status,conclusion \
           --jq '.[] | select(.conclusion=="success") | .databaseId' \
           | head -n 1)