Skip to content

NET 10 Update #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yurkinh wants to merge 2 commits into
base: main
Choose a base branch
from
Open

NET 10 Update #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa9eb8b
Update project files for .NET 10 compatibility and remove obsolete so…
yurkinh Dec 8, 2025
127114c
Disabled emitting of the source generated files
yurkinh Dec 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 0 additions & 33 deletions src/FastPopups.sln
View file
Open in desktop

This file was deleted.

4 changes: 4 additions & 0 deletions src/FastPopups.slnx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<Solution>
<Project Path="Lib/FastPopups.csproj" />
<Project Path="Sample/SampleApp.csproj" />
</Solution>
9 changes: 5 additions & 4 deletions src/Lib/FastPopups.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -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>
Expand Down
3 changes: 1 addition & 2 deletions src/Lib/Platforms/Android/MauiPopup.android.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
//{
Expand Down Expand Up @@ -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();
Expand Down
14 changes: 1 addition & 13 deletions src/Sample/Resources/Styles/Styles.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Copy link

Copilot AI Dec 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Trailing whitespace detected at the end of this line. Consider removing it for cleaner code formatting.

Suggested change
</Style>
</Style>

Copilot uses AI. Check for mistakes.

<Style TargetType="ImageButton">
<Setter Property="Opacity" Value="1" />
Expand Down Expand Up @@ -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}}" />
Expand Down
16 changes: 10 additions & 6 deletions src/Sample/SampleApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -20,6 +20,10 @@
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>

<MauiXamlInflator>SourceGen</MauiXamlInflator>
<!--<EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
<CompilerGeneratedFilesOutputPath>$(BaseIntermediateOutputPath)Generated</CompilerGeneratedFilesOutputPath>-->

<!-- Display name -->
<ApplicationTitle>FastPopups Sample</ApplicationTitle>

Expand Down Expand Up @@ -64,8 +68,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>
Expand Down
2 changes: 1 addition & 1 deletion src/Sample/Views/NavigationStackPopup.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Copy link

Copilot AI Dec 8, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Accessing Application.Current?.Windows[0] without null or bounds checking could throw an IndexOutOfRangeException if the Windows collection is empty. Consider adding a check to ensure the collection has at least one element before accessing index 0:

var currentPage = Application.Current?.Windows.FirstOrDefault()?.Page;

Copilot uses AI. Check for mistakes.
if (currentPage != null)
{
await currentPage.ShowPopupAsync(nextPopup);
Expand Down