From 96513468d8be5f445df2f9dde2634476ad2dc703 Mon Sep 17 00:00:00 2001
From: ClemensFischer <fischer.clemens@gmail.com>
Date: Fri, 14 Nov 2025 16:56:11 +0100
Subject: [PATCH] .NET 10

---
 Directory.Build.props                                  | 2 +-
 MBTiles/Avalonia/MBTiles.Avalonia.csproj               | 2 +-
 MBTiles/UWP/MBTiles.UWP.csproj                         | 2 +-
 MBTiles/WPF/MBTiles.WPF.csproj                         | 2 +-
 MBTiles/WinUI/MBTiles.WinUI.csproj                     | 2 +-
 MapControl/Avalonia/MapControl.Avalonia.csproj         | 2 +-
 MapControl/Avalonia/PushpinBorder.Avalonia.cs          | 1 +
 MapControl/Shared/MapGraticule.cs                      | 1 +
 MapControl/UWP/MapControl.UWP.csproj                   | 2 +-
 MapControl/UWP/Themes/Generic.xaml                     | 2 +-
 MapControl/WPF/MapControl.WPF.csproj                   | 2 +-
 MapControl/WinUI/MapControl.WinUI.csproj               | 2 +-
 MapControl/WinUI/Themes/Generic.xaml                   | 2 +-
 MapProjections/Avalonia/MapProjections.Avalonia.csproj | 2 +-
 MapProjections/UWP/MapProjections.UWP.csproj           | 2 +-
 MapProjections/WPF/MapProjections.WPF.csproj           | 2 +-
 MapProjections/WinUI/MapProjections.WinUI.csproj       | 2 +-
 MapUiTools/Avalonia/MapUiTools.Avalonia.csproj         | 2 +-
 MapUiTools/UWP/MapUiTools.UWP.csproj                   | 2 +-
 MapUiTools/WPF/MapUiTools.WPF.csproj                   | 2 +-
 MapUiTools/WinUI/MapUiTools.WinUI.csproj               | 2 +-
 SampleApps/AvaloniaApp/AvaloniaApp.csproj              | 2 +-
 SampleApps/ProjectionDemo/ProjectionDemo.csproj        | 2 +-
 SampleApps/UniversalApp/UniversalApp.csproj            | 2 +-
 SampleApps/WinUiApp/WinUiApp.csproj                    | 2 +-
 SampleApps/WpfApplication/WpfApplication.csproj        | 2 +-
 26 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 0a4b5520..cc0edfec 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -3,7 +3,7 @@
         <Product>XAML Map Control</Product>
         <Authors>Clemens Fischer</Authors>
         <Copyright>Copyright © 2025 Clemens Fischer</Copyright>
-        <Version>14.2.0</Version>
+        <Version>15.0.0</Version>
         <AssemblyVersion>$(Version)</AssemblyVersion>
         <AssemblyOriginatorKeyFile>..\..\MapControl.snk</AssemblyOriginatorKeyFile>
         <SignAssembly>true</SignAssembly>
diff --git a/MBTiles/Avalonia/MBTiles.Avalonia.csproj b/MBTiles/Avalonia/MBTiles.Avalonia.csproj
index f9144a9e..5b6843e4 100644
--- a/MBTiles/Avalonia/MBTiles.Avalonia.csproj
+++ b/MBTiles/Avalonia/MBTiles.Avalonia.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>net10.0</TargetFramework>
         <DefineConstants>AVALONIA</DefineConstants>
         <RootNamespace>MapControl.MBTiles</RootNamespace>
         <AssemblyTitle>XAML Map Control MBTiles Library for Avalonia UI</AssemblyTitle>
diff --git a/MBTiles/UWP/MBTiles.UWP.csproj b/MBTiles/UWP/MBTiles.UWP.csproj
index 68e2cfca..0e736273 100644
--- a/MBTiles/UWP/MBTiles.UWP.csproj
+++ b/MBTiles/UWP/MBTiles.UWP.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>net9.0-windows10.0.26100.0</TargetFramework>
+        <TargetFramework>net10.0-windows10.0.26100.0</TargetFramework>
         <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
         <UseUwp>true</UseUwp>
         <DefineConstants>UWP</DefineConstants>
diff --git a/MBTiles/WPF/MBTiles.WPF.csproj b/MBTiles/WPF/MBTiles.WPF.csproj
index 94b05804..b7e1e29e 100644
--- a/MBTiles/WPF/MBTiles.WPF.csproj
+++ b/MBTiles/WPF/MBTiles.WPF.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>net9.0-windows;net462</TargetFrameworks>
+        <TargetFrameworks>net10.0-windows;net462</TargetFrameworks>
         <LangVersion Condition="'$(TargetFramework)'=='net462'">12.0</LangVersion>
         <UseWPF>true</UseWPF>
         <DefineConstants>WPF</DefineConstants>
diff --git a/MBTiles/WinUI/MBTiles.WinUI.csproj b/MBTiles/WinUI/MBTiles.WinUI.csproj
index bfedad29..7857088c 100644
--- a/MBTiles/WinUI/MBTiles.WinUI.csproj
+++ b/MBTiles/WinUI/MBTiles.WinUI.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>net9.0-windows10.0.17763.0</TargetFramework>
+        <TargetFramework>net10.0-windows10.0.17763.0</TargetFramework>
         <UseWinUI>true</UseWinUI>
         <DefineConstants>WINUI</DefineConstants>
         <RootNamespace>MapControl.MBTiles</RootNamespace>
diff --git a/MapControl/Avalonia/MapControl.Avalonia.csproj b/MapControl/Avalonia/MapControl.Avalonia.csproj
index f672c127..dde1ff3f 100644
--- a/MapControl/Avalonia/MapControl.Avalonia.csproj
+++ b/MapControl/Avalonia/MapControl.Avalonia.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>net10.0</TargetFramework>
         <DefineConstants>AVALONIA</DefineConstants>
         <RootNamespace>MapControl</RootNamespace>
         <AssemblyTitle>XAML Map Control Library for Avalonia UI</AssemblyTitle>
diff --git a/MapControl/Avalonia/PushpinBorder.Avalonia.cs b/MapControl/Avalonia/PushpinBorder.Avalonia.cs
index 4266431e..4bca6fd2 100644
--- a/MapControl/Avalonia/PushpinBorder.Avalonia.cs
+++ b/MapControl/Avalonia/PushpinBorder.Avalonia.cs
@@ -2,6 +2,7 @@
 using Avalonia.Controls;
 using Avalonia.Media;
 using System;
+using Brush = Avalonia.Media.IBrush;
 
 namespace MapControl
 {
diff --git a/MapControl/Shared/MapGraticule.cs b/MapControl/Shared/MapGraticule.cs
index 92cd6345..7a3f10bb 100644
--- a/MapControl/Shared/MapGraticule.cs
+++ b/MapControl/Shared/MapGraticule.cs
@@ -14,6 +14,7 @@ using Microsoft.UI.Xaml.Media;
 #elif AVALONIA
 using Avalonia;
 using Avalonia.Media;
+using Brush = Avalonia.Media.IBrush;
 using PathFigureCollection = Avalonia.Media.PathFigures;
 #endif
 
diff --git a/MapControl/UWP/MapControl.UWP.csproj b/MapControl/UWP/MapControl.UWP.csproj
index 0d237f81..c57148bd 100644
--- a/MapControl/UWP/MapControl.UWP.csproj
+++ b/MapControl/UWP/MapControl.UWP.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>net9.0-windows10.0.26100.0</TargetFramework>
+        <TargetFramework>net10.0-windows10.0.26100.0</TargetFramework>
         <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
         <UseUwp>true</UseUwp>
         <DefineConstants>UWP</DefineConstants>
diff --git a/MapControl/UWP/Themes/Generic.xaml b/MapControl/UWP/Themes/Generic.xaml
index a84410d9..79c00e8c 100644
--- a/MapControl/UWP/Themes/Generic.xaml
+++ b/MapControl/UWP/Themes/Generic.xaml
@@ -54,7 +54,7 @@
         <Setter Property="VerticalContentAlignment" Value="Center"/>
         <Setter Property="BorderThickness" Value="1"/>
         <Setter Property="CornerRadius" Value="0"/>
-        <Setter Property="Padding" Value="3,6,4,6"/>
+        <Setter Property="Padding" Value="4,6"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="map:Pushpin">
diff --git a/MapControl/WPF/MapControl.WPF.csproj b/MapControl/WPF/MapControl.WPF.csproj
index 5cbbecfb..cd0675cc 100644
--- a/MapControl/WPF/MapControl.WPF.csproj
+++ b/MapControl/WPF/MapControl.WPF.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>net9.0-windows;net462</TargetFrameworks>
+        <TargetFrameworks>net10.0-windows;net462</TargetFrameworks>
         <LangVersion Condition="'$(TargetFramework)'=='net462'">12.0</LangVersion>
         <UseWPF>true</UseWPF>
         <DefineConstants>WPF</DefineConstants>
diff --git a/MapControl/WinUI/MapControl.WinUI.csproj b/MapControl/WinUI/MapControl.WinUI.csproj
index b0f447fd..9cff429a 100644
--- a/MapControl/WinUI/MapControl.WinUI.csproj
+++ b/MapControl/WinUI/MapControl.WinUI.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>net9.0-windows10.0.17763.0</TargetFramework>
+        <TargetFramework>net10.0-windows10.0.17763.0</TargetFramework>
         <UseWinUI>true</UseWinUI>
         <DefineConstants>WINUI</DefineConstants>
         <RootNamespace>MapControl</RootNamespace>
diff --git a/MapControl/WinUI/Themes/Generic.xaml b/MapControl/WinUI/Themes/Generic.xaml
index 743e4ca7..cd119dbc 100644
--- a/MapControl/WinUI/Themes/Generic.xaml
+++ b/MapControl/WinUI/Themes/Generic.xaml
@@ -54,7 +54,7 @@
         <Setter Property="VerticalContentAlignment" Value="Center"/>
         <Setter Property="BorderThickness" Value="1"/>
         <Setter Property="CornerRadius" Value="0"/>
-        <Setter Property="Padding" Value="6,3,6,4"/>
+        <Setter Property="Padding" Value="6,4"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="map:Pushpin">
diff --git a/MapProjections/Avalonia/MapProjections.Avalonia.csproj b/MapProjections/Avalonia/MapProjections.Avalonia.csproj
index 34197f31..8c795220 100644
--- a/MapProjections/Avalonia/MapProjections.Avalonia.csproj
+++ b/MapProjections/Avalonia/MapProjections.Avalonia.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>net10.0</TargetFramework>
         <DefineConstants>AVALONIA</DefineConstants>
         <RootNamespace>MapControl.Projections</RootNamespace>
         <AssemblyTitle>XAML Map Control Projections Library for Avalonia UI</AssemblyTitle>
diff --git a/MapProjections/UWP/MapProjections.UWP.csproj b/MapProjections/UWP/MapProjections.UWP.csproj
index ade3ccdb..d79be04a 100644
--- a/MapProjections/UWP/MapProjections.UWP.csproj
+++ b/MapProjections/UWP/MapProjections.UWP.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>net9.0-windows10.0.26100.0</TargetFramework>
+        <TargetFramework>net10.0-windows10.0.26100.0</TargetFramework>
         <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
         <UseUwp>true</UseUwp>
         <DefineConstants>UWP</DefineConstants>
diff --git a/MapProjections/WPF/MapProjections.WPF.csproj b/MapProjections/WPF/MapProjections.WPF.csproj
index 0cc7a2af..6f0a1e23 100644
--- a/MapProjections/WPF/MapProjections.WPF.csproj
+++ b/MapProjections/WPF/MapProjections.WPF.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>net9.0-windows;net462</TargetFrameworks>
+        <TargetFrameworks>net10.0-windows;net462</TargetFrameworks>
         <LangVersion Condition="'$(TargetFramework)'=='net462'">12.0</LangVersion>
         <UseWPF>true</UseWPF>
         <DefineConstants>WPF</DefineConstants>
diff --git a/MapProjections/WinUI/MapProjections.WinUI.csproj b/MapProjections/WinUI/MapProjections.WinUI.csproj
index 490798d7..41882fd8 100644
--- a/MapProjections/WinUI/MapProjections.WinUI.csproj
+++ b/MapProjections/WinUI/MapProjections.WinUI.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>net9.0-windows10.0.17763.0</TargetFramework>
+        <TargetFramework>net10.0-windows10.0.17763.0</TargetFramework>
         <UseWinUI>true</UseWinUI>
         <DefineConstants>WINUI</DefineConstants>
         <RootNamespace>MapControl.Projections</RootNamespace>
diff --git a/MapUiTools/Avalonia/MapUiTools.Avalonia.csproj b/MapUiTools/Avalonia/MapUiTools.Avalonia.csproj
index aed5ec49..0b7d0ed1 100644
--- a/MapUiTools/Avalonia/MapUiTools.Avalonia.csproj
+++ b/MapUiTools/Avalonia/MapUiTools.Avalonia.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>net10.0</TargetFramework>
         <DefineConstants>AVALONIA</DefineConstants>
         <RootNamespace>MapControl.UiTools</RootNamespace>
         <AssemblyTitle>XAML Map Control UI Tools Library for Avalonia UI</AssemblyTitle>
diff --git a/MapUiTools/UWP/MapUiTools.UWP.csproj b/MapUiTools/UWP/MapUiTools.UWP.csproj
index eb98d71e..50a9bc26 100644
--- a/MapUiTools/UWP/MapUiTools.UWP.csproj
+++ b/MapUiTools/UWP/MapUiTools.UWP.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>net9.0-windows10.0.26100.0</TargetFramework>
+        <TargetFramework>net10.0-windows10.0.26100.0</TargetFramework>
         <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
         <UseUwp>true</UseUwp>
         <DefineConstants>UWP</DefineConstants>
diff --git a/MapUiTools/WPF/MapUiTools.WPF.csproj b/MapUiTools/WPF/MapUiTools.WPF.csproj
index acbabd9d..82c7538d 100644
--- a/MapUiTools/WPF/MapUiTools.WPF.csproj
+++ b/MapUiTools/WPF/MapUiTools.WPF.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFrameworks>net9.0-windows;net462</TargetFrameworks>
+        <TargetFrameworks>net10.0-windows;net462</TargetFrameworks>
         <LangVersion Condition="'$(TargetFramework)'=='net462'">12.0</LangVersion>
         <UseWPF>true</UseWPF>
         <DefineConstants>WPF</DefineConstants>
diff --git a/MapUiTools/WinUI/MapUiTools.WinUI.csproj b/MapUiTools/WinUI/MapUiTools.WinUI.csproj
index f76922d3..717a85c5 100644
--- a/MapUiTools/WinUI/MapUiTools.WinUI.csproj
+++ b/MapUiTools/WinUI/MapUiTools.WinUI.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-        <TargetFramework>net9.0-windows10.0.17763.0</TargetFramework>
+        <TargetFramework>net10.0-windows10.0.17763.0</TargetFramework>
         <UseWinUI>true</UseWinUI>
         <DefineConstants>WINUI</DefineConstants>
         <RootNamespace>MapControl.UiTools</RootNamespace>
diff --git a/SampleApps/AvaloniaApp/AvaloniaApp.csproj b/SampleApps/AvaloniaApp/AvaloniaApp.csproj
index 8c6b66ff..1331112b 100644
--- a/SampleApps/AvaloniaApp/AvaloniaApp.csproj
+++ b/SampleApps/AvaloniaApp/AvaloniaApp.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>WinExe</OutputType>
-        <TargetFramework>net9.0</TargetFramework>
+        <TargetFramework>net10.0</TargetFramework>
         <DefineConstants>AVALONIA</DefineConstants>
         <RootNamespace>SampleApplication</RootNamespace>
         <AssemblyTitle>XAML Map Control Avalonia Sample Application</AssemblyTitle>
diff --git a/SampleApps/ProjectionDemo/ProjectionDemo.csproj b/SampleApps/ProjectionDemo/ProjectionDemo.csproj
index 24f5a79c..121338a7 100644
--- a/SampleApps/ProjectionDemo/ProjectionDemo.csproj
+++ b/SampleApps/ProjectionDemo/ProjectionDemo.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>WinExe</OutputType>
-        <TargetFramework>net9.0-windows</TargetFramework>
+        <TargetFramework>net10.0-windows</TargetFramework>
         <UseWPF>true</UseWPF>
         <RootNamespace>ProjectionDemo</RootNamespace>
         <AssemblyTitle>XAML Map Control Projection Demo Application</AssemblyTitle>
diff --git a/SampleApps/UniversalApp/UniversalApp.csproj b/SampleApps/UniversalApp/UniversalApp.csproj
index 1dd6e56f..12ede541 100644
--- a/SampleApps/UniversalApp/UniversalApp.csproj
+++ b/SampleApps/UniversalApp/UniversalApp.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>WinExe</OutputType>
-        <TargetFramework>net9.0-windows10.0.26100.0</TargetFramework>
+        <TargetFramework>net10.0-windows10.0.26100.0</TargetFramework>
         <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
         <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
         <Platforms>x86;x64;arm64</Platforms>
diff --git a/SampleApps/WinUiApp/WinUiApp.csproj b/SampleApps/WinUiApp/WinUiApp.csproj
index 9c92ce7c..9e0e2010 100644
--- a/SampleApps/WinUiApp/WinUiApp.csproj
+++ b/SampleApps/WinUiApp/WinUiApp.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>WinExe</OutputType>
-        <TargetFramework>net9.0-windows10.0.17763.0</TargetFramework>
+        <TargetFramework>net10.0-windows10.0.17763.0</TargetFramework>
         <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
         <Platforms>x86;x64;arm64</Platforms>
         <PublishProfile>win-$(Platform).pubxml</PublishProfile>
diff --git a/SampleApps/WpfApplication/WpfApplication.csproj b/SampleApps/WpfApplication/WpfApplication.csproj
index 39f5cfbf..c5ac03aa 100644
--- a/SampleApps/WpfApplication/WpfApplication.csproj
+++ b/SampleApps/WpfApplication/WpfApplication.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <OutputType>WinExe</OutputType>
-        <TargetFrameworks>net9.0-windows;net48</TargetFrameworks>
+        <TargetFrameworks>net10.0-windows;net48</TargetFrameworks>
         <UseWPF>true</UseWPF>
         <DefineConstants>WPF</DefineConstants>
         <RootNamespace>SampleApplication</RootNamespace>