From e885d6c6257420f4575fdd7447e182c21f4d0b0a Mon Sep 17 00:00:00 2001
From: Vladislav Richter <shutdown256@gmail.com>
Date: Fri, 21 Nov 2025 11:38:57 +0100
Subject: [PATCH 1/4] Update to .NET9

---
 sample/Sample/Sample.csproj                               | 2 +-
 src/Acr.UserDialogs/Acr.UserDialogs.csproj                | 2 +-
 src/Acr.UserDialogs/Platforms/ios/Infrastructure/Utils.cs | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/sample/Sample/Sample.csproj b/sample/Sample/Sample.csproj
index fd190e0d..e46804cb 100644
--- a/sample/Sample/Sample.csproj
+++ b/sample/Sample/Sample.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
+    <TargetFrameworks>net9.0-android;net9.0-ios;net9.0-maccatalyst</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <RootNamespace>Sample</RootNamespace>
     <UseMaui>true</UseMaui>
diff --git a/src/Acr.UserDialogs/Acr.UserDialogs.csproj b/src/Acr.UserDialogs/Acr.UserDialogs.csproj
index 6394a112..e5500138 100644
--- a/src/Acr.UserDialogs/Acr.UserDialogs.csproj
+++ b/src/Acr.UserDialogs/Acr.UserDialogs.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>net8.0;net8.0-ios;net8.0-android;net8.0-maccatalyst</TargetFrameworks>
+        <TargetFrameworks>net9.0;net9.0-ios;net9.0-android;net9.0-maccatalyst</TargetFrameworks>
         <AssemblyName>MailClient.Acr.UserDialogs</AssemblyName>
         <PackageId>MailClient.Acr.UserDialogs</PackageId>
         <PackageProjectUrl>https://github.com/emclient/userdialogs</PackageProjectUrl>
diff --git a/src/Acr.UserDialogs/Platforms/ios/Infrastructure/Utils.cs b/src/Acr.UserDialogs/Platforms/ios/Infrastructure/Utils.cs
index 4c818165..e7f0af78 100644
--- a/src/Acr.UserDialogs/Platforms/ios/Infrastructure/Utils.cs
+++ b/src/Acr.UserDialogs/Platforms/ios/Infrastructure/Utils.cs
@@ -9,6 +9,7 @@ public static class Utils
     {
         public static UIWindow GetTopWindow(this UIApplication app) => app
             .Windows
+            .AsEnumerable()
             .Reverse()
             .FirstOrDefault(x =>
                 x.WindowLevel == UIWindowLevel.Normal &&

From 685ce32300929d65878f7baf661513f51ad4eca6 Mon Sep 17 00:00:00 2001
From: Vladislav Richter <shutdown256@gmail.com>
Date: Fri, 21 Nov 2025 11:48:35 +0100
Subject: [PATCH 2/4] attempt to fix GH build

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

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3a88a162..efde15b8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,7 +16,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 9.0.x
     - name: Install workloads
       run: dotnet workload install -s https://api.nuget.org/v3/index.json android ios maccatalyst
     - name: Setup Java
@@ -44,7 +44,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 9.0.x
         include-prerelease: true
     - uses: actions/download-artifact@master
       with:

From 3cecfdc2731da516dfed6abbbc7fbbf0bc92f005 Mon Sep 17 00:00:00 2001
From: Vladislav Richter <shutdown256@gmail.com>
Date: Fri, 21 Nov 2025 12:12:26 +0100
Subject: [PATCH 3/4] attempt to fix GH build 2

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

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index efde15b8..ee3fe7f9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -25,7 +25,7 @@ jobs:
         distribution: 'microsoft'
         java-version: '17'
     - name: Add msbuild to PATH
-      uses: microsoft/setup-msbuild@v1.0.2
+      uses: microsoft/setup-msbuild@v2
     - name: Build
       run: msbuild src/Acr.UserDialogs /p:Configuration=Release /p:PublicRelease=true /restore
     - name: Pack

From 473ff1509c718d25a7c4f17ea4dbc9eff866fe2c Mon Sep 17 00:00:00 2001
From: Vladislav Richter <shutdown256@gmail.com>
Date: Fri, 21 Nov 2025 12:35:06 +0100
Subject: [PATCH 4/4] attempt to fix GH build 3

---
 .github/workflows/build.yml                | 4 ++--
 src/Acr.UserDialogs/Acr.UserDialogs.csproj | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ee3fe7f9..1b10f8ca 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,7 +18,7 @@ jobs:
       with:
         dotnet-version: 9.0.x
     - name: Install workloads
-      run: dotnet workload install -s https://api.nuget.org/v3/index.json android ios maccatalyst
+      run: dotnet workload restore --project src/Acr.UserDialogs/Acr.UserDialogs.csproj
     - name: Setup Java
       uses: actions/setup-java@v2
       with:
@@ -27,7 +27,7 @@ jobs:
     - name: Add msbuild to PATH
       uses: microsoft/setup-msbuild@v2
     - name: Build
-      run: msbuild src/Acr.UserDialogs /p:Configuration=Release /p:PublicRelease=true /restore
+      run: dotnet build src/Acr.UserDialogs/Acr.UserDialogs.csproj -p:Configuration=Release -p:PublicRelease=true
     - name: Pack
       run: msbuild src/Acr.UserDialogs /p:Configuration=Release /p:PublicRelease=true /t:Pack
     - uses: actions/upload-artifact@master
diff --git a/src/Acr.UserDialogs/Acr.UserDialogs.csproj b/src/Acr.UserDialogs/Acr.UserDialogs.csproj
index e5500138..4ea7db34 100644
--- a/src/Acr.UserDialogs/Acr.UserDialogs.csproj
+++ b/src/Acr.UserDialogs/Acr.UserDialogs.csproj
@@ -41,7 +41,7 @@
 
     <ItemGroup Condition=" $(TargetFramework.Contains('android')) ">
         <Compile Include="Platforms\Android\**\*.cs" />
-        <PackageReference Include="AndHUD" Version="2.0.1" />
+        <PackageReference Include="AndHUD" Version="2.1.0" />
         <PackageReference Include="Xamarin.Google.Android.Material" Version="1.9.0.2" />
     </ItemGroup>