From aa9eb8b3401d9492c469576ed5360a2e29b376e2 Mon Sep 17 00:00:00 2001
From: Yuriy Holembyovskyy <yholembyovskyy@gmail.com>
Date: Mon, 8 Dec 2025 19:45:14 +0200
Subject: [PATCH 1/2] Update project files for .NET 10 compatibility and remove
 obsolete solution file

---
 src/FastPopups.sln                            | 33 -------------------
 src/FastPopups.slnx                           |  4 +++
 src/Lib/FastPopups.csproj                     |  9 ++---
 .../Platforms/Android/MauiPopup.android.cs    |  3 +-
 src/Sample/Resources/Styles/Styles.xaml       | 14 +-------
 src/Sample/SampleApp.csproj                   | 15 +++++----
 src/Sample/Views/NavigationStackPopup.xaml.cs |  2 +-
 7 files changed, 21 insertions(+), 59 deletions(-)
 delete mode 100644 src/FastPopups.sln
 create mode 100644 src/FastPopups.slnx

diff --git a/src/FastPopups.sln b/src/FastPopups.sln
deleted file mode 100644
index 2fecae9..0000000
--- a/src/FastPopups.sln
+++ /dev/null
@@ -1,33 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.14.36203.30
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FastPopups", "Lib\FastPopups.csproj", "{D1C7A25F-A0F4-5FCB-3C4A-925EB50C86CC}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SampleApp", "Sample\SampleApp.csproj", "{424A2DEE-CECD-4F9A-C294-5F1C35E1D543}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D1C7A25F-A0F4-5FCB-3C4A-925EB50C86CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D1C7A25F-A0F4-5FCB-3C4A-925EB50C86CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D1C7A25F-A0F4-5FCB-3C4A-925EB50C86CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D1C7A25F-A0F4-5FCB-3C4A-925EB50C86CC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{424A2DEE-CECD-4F9A-C294-5F1C35E1D543}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{424A2DEE-CECD-4F9A-C294-5F1C35E1D543}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{424A2DEE-CECD-4F9A-C294-5F1C35E1D543}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
-		{424A2DEE-CECD-4F9A-C294-5F1C35E1D543}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{424A2DEE-CECD-4F9A-C294-5F1C35E1D543}.Release|Any CPU.Build.0 = Release|Any CPU
-		{424A2DEE-CECD-4F9A-C294-5F1C35E1D543}.Release|Any CPU.Deploy.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {B19A6BE2-4681-40FD-87D5-4AEC5AA07B5C}
-	EndGlobalSection
-EndGlobal
diff --git a/src/FastPopups.slnx b/src/FastPopups.slnx
new file mode 100644
index 0000000..4488a8a
--- /dev/null
+++ b/src/FastPopups.slnx
@@ -0,0 +1,4 @@
+<Solution>
+  <Project Path="Lib/FastPopups.csproj" />
+  <Project Path="Sample/SampleApp.csproj" />
+</Solution>
diff --git a/src/Lib/FastPopups.csproj b/src/Lib/FastPopups.csproj
index eb47fad..4eb6f08 100644
--- a/src/Lib/FastPopups.csproj
+++ b/src/Lib/FastPopups.csproj
@@ -1,9 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net9.0;net9.0-android;net9.0-ios;net9.0-maccatalyst;net9.0-windows10.0.19041.0</TargetFrameworks>
+    <TargetFrameworks>net10.0;net10.0-android;net10.0-ios;net10.0-maccatalyst;net10.0-windows10.0.19041.0</TargetFrameworks>
     <OutputType>Library</OutputType>
     <UseMaui>true</UseMaui>
+    <EnableWindowsTargeting>true</EnableWindowsTargeting>
     <SingleProject>true</SingleProject>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
@@ -29,8 +30,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Maui.Controls" Version="9.0.70" />
-    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="9.0.70" />
+    <PackageReference Include="Microsoft.Maui.Controls" Version="10.0.11" />
+    <PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="10.0.11" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Lib/Platforms/Android/MauiPopup.android.cs b/src/Lib/Platforms/Android/MauiPopup.android.cs
index 75b740c..9de7e54 100644
--- a/src/Lib/Platforms/Android/MauiPopup.android.cs
+++ b/src/Lib/Platforms/Android/MauiPopup.android.cs
@@ -622,7 +622,7 @@ Size GetScreenSize(IWindowManager windowManager)
     /// <returns>The status bar height in DIPs.</returns>
     double GetStatusBarHeight(Context context)
     {
-        double heightPixels = 0;
+        //double heightPixels = 0;
 
         //if (OperatingSystem.IsAndroidVersionAtLeast(30))
         //{
@@ -660,7 +660,6 @@ double GetNavigationBarHeight(IWindowManager windowManager)
             var windowMetrics = windowManager.CurrentWindowMetrics;
             var insets = windowMetrics.WindowInsets;
             var windowInsets = insets.GetInsetsIgnoringVisibility(WindowInsets.Type.SystemBars());
-            var windowInsets2 = insets.HasSystemWindowInsets;
 
             var windowWidth = windowMetrics.Bounds.Width();
             var windowHeight = windowMetrics.Bounds.Height();
diff --git a/src/Sample/Resources/Styles/Styles.xaml b/src/Sample/Resources/Styles/Styles.xaml
index 86f574d..37507ae 100644
--- a/src/Sample/Resources/Styles/Styles.xaml
+++ b/src/Sample/Resources/Styles/Styles.xaml
@@ -130,14 +130,7 @@
                 </VisualStateGroup>
             </VisualStateGroupList>
         </Setter>
-    </Style>
-
-    <Style TargetType="Frame">
-        <Setter Property="HasShadow" Value="False" />
-        <Setter Property="BorderColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray950}}" />
-        <Setter Property="CornerRadius" Value="8" />
-        <Setter Property="BackgroundColor" Value="{AppThemeBinding Light={StaticResource White}, Dark={StaticResource Black}}" />
-    </Style>
+    </Style>   
 
     <Style TargetType="ImageButton">
         <Setter Property="Opacity" Value="1" />
@@ -198,11 +191,6 @@
         <Setter Property="HorizontalTextAlignment" Value="Center" />
     </Style>
 
-    <Style TargetType="ListView">
-        <Setter Property="SeparatorColor" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray500}}" />
-        <Setter Property="RefreshControlColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource Gray200}}" />
-    </Style>
-
     <Style TargetType="Picker">
         <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource White}}" />
         <Setter Property="TitleColor" Value="{AppThemeBinding Light={StaticResource Gray900}, Dark={StaticResource Gray200}}" />
diff --git a/src/Sample/SampleApp.csproj b/src/Sample/SampleApp.csproj
index 340bbfc..5261d2c 100644
--- a/src/Sample/SampleApp.csproj
+++ b/src/Sample/SampleApp.csproj
@@ -1,10 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net9.0-android;net9.0-ios;net9.0-maccatalyst</TargetFrameworks>
-		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net9.0-windows10.0.19041.0</TargetFrameworks>
+		<TargetFrameworks>net10.0-android;net10.0-ios;net10.0-maccatalyst</TargetFrameworks>
+		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net10.0-windows10.0.19041.0</TargetFrameworks>
 		<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
-		<!-- <TargetFrameworks>$(TargetFrameworks);net9.0-tizen</TargetFrameworks> -->
+		<!-- <TargetFrameworks>$(TargetFrameworks);net10.0-tizen</TargetFrameworks> -->
 
 		<!-- Note for MacCatalyst:
 		The default runtime is maccatalyst-x64, except in Release config, in which case the default is maccatalyst-x64;maccatalyst-arm64.
@@ -20,6 +20,9 @@
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 
+		<MauiXamlInflator>SourceGen</MauiXamlInflator>
+		<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
+
 		<!-- Display name -->
 		<ApplicationTitle>FastPopups Sample</ApplicationTitle>
 
@@ -64,8 +67,8 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Maui.Controls" Version="9.0.70" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0" />
+		<PackageReference Include="Microsoft.Maui.Controls" Version="10.0.11" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="10.0.0" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/src/Sample/Views/NavigationStackPopup.xaml.cs b/src/Sample/Views/NavigationStackPopup.xaml.cs
index c824ba6..d3f4c02 100644
--- a/src/Sample/Views/NavigationStackPopup.xaml.cs
+++ b/src/Sample/Views/NavigationStackPopup.xaml.cs
@@ -79,7 +79,7 @@ private async void OnShowNextClicked(object? sender, EventArgs e)
             var nextPopup = new NavigationStackPopup(_level + 1);
 
             // Get the current page to show the popup
-            var currentPage = Application.Current?.MainPage;
+            var currentPage = Application.Current?.Windows[0].Page;
             if (currentPage != null)
             {
                 await currentPage.ShowPopupAsync(nextPopup);

From 127114c8346b143c5be484969c1d8098e0211f5a Mon Sep 17 00:00:00 2001
From: "WORKSTATION\\yuriy" <yholembyovskyy@gmail.com>
Date: Mon, 8 Dec 2025 19:55:51 +0200
Subject: [PATCH 2/2] Disabled emitting of the source generated files

---
 src/Sample/SampleApp.csproj | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Sample/SampleApp.csproj b/src/Sample/SampleApp.csproj
index 5261d2c..726d0ab 100644
--- a/src/Sample/SampleApp.csproj
+++ b/src/Sample/SampleApp.csproj
@@ -21,7 +21,8 @@
 		<Nullable>enable</Nullable>
 
 		<MauiXamlInflator>SourceGen</MauiXamlInflator>
-		<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
+		<!--<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
+		<CompilerGeneratedFilesOutputPath>$(BaseIntermediateOutputPath)Generated</CompilerGeneratedFilesOutputPath>-->
 
 		<!-- Display name -->
 		<ApplicationTitle>FastPopups Sample</ApplicationTitle>