diff --git a/MBTiles/UWP/MBTiles.UWP.csproj b/MBTiles/UWP/MBTiles.UWP.csproj
index 1a2d56f1..68e2cfca 100644
--- a/MBTiles/UWP/MBTiles.UWP.csproj
+++ b/MBTiles/UWP/MBTiles.UWP.csproj
@@ -3,8 +3,6 @@
         <TargetFramework>net9.0-windows10.0.26100.0</TargetFramework>
         <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
         <UseUwp>true</UseUwp>
-        <DisableRuntimeMarshalling>true</DisableRuntimeMarshalling>
-        <DefaultLanguage>en-US</DefaultLanguage>
         <DefineConstants>UWP</DefineConstants>
         <RootNamespace>MapControl.MBTiles</RootNamespace>
         <AssemblyTitle>XAML Map Control MBTiles Library for UWP</AssemblyTitle>
@@ -12,6 +10,8 @@
         <PackageId>XAML.MapControl.MBTiles.UWP</PackageId>
         <Title>$(AssemblyTitle)</Title>
         <Description>MBTiles library for XAML Map Control</Description>
+        <DisableRuntimeMarshalling>true</DisableRuntimeMarshalling>
+        <DefaultLanguage>en-US</DefaultLanguage>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/MapControl/Avalonia/MapControl.Avalonia.csproj b/MapControl/Avalonia/MapControl.Avalonia.csproj
index 0ab44b11..cb067c79 100644
--- a/MapControl/Avalonia/MapControl.Avalonia.csproj
+++ b/MapControl/Avalonia/MapControl.Avalonia.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <TargetFramework>net9.0</TargetFramework>
-        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <DefineConstants>AVALONIA</DefineConstants>
         <RootNamespace>MapControl</RootNamespace>
         <AssemblyTitle>XAML Map Control Library for Avalonia UI</AssemblyTitle>
@@ -9,6 +8,7 @@
         <PackageId>XAML.MapControl.Avalonia</PackageId>
         <Title>$(AssemblyTitle)</Title>
         <Description>A set of Avalonia UI controls for rendering raster maps from different providers like OpenStreetMap and various types of map overlays</Description>
+        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/MapControl/UWP/MapControl.UWP.csproj b/MapControl/UWP/MapControl.UWP.csproj
index 19aa6099..846db92e 100644
--- a/MapControl/UWP/MapControl.UWP.csproj
+++ b/MapControl/UWP/MapControl.UWP.csproj
@@ -3,9 +3,6 @@
         <TargetFramework>net9.0-windows10.0.26100.0</TargetFramework>
         <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
         <UseUwp>true</UseUwp>
-        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-        <DisableRuntimeMarshalling>true</DisableRuntimeMarshalling>
-        <DefaultLanguage>en-US</DefaultLanguage>
         <DefineConstants>UWP</DefineConstants>
         <RootNamespace>MapControl</RootNamespace>
         <AssemblyTitle>XAML Map Control Library for UWP</AssemblyTitle>
@@ -13,6 +10,8 @@
         <PackageId>XAML.MapControl.UWP</PackageId>
         <Title>$(AssemblyTitle)</Title>
         <Description>A set of UWP controls for rendering raster maps from different providers like OpenStreetMap and various types of map overlays</Description>
+        <DisableRuntimeMarshalling>true</DisableRuntimeMarshalling>
+        <DefaultLanguage>en-US</DefaultLanguage>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/MapControl/WinUI/MapControl.WinUI.csproj b/MapControl/WinUI/MapControl.WinUI.csproj
index 158de74d..c6805d2c 100644
--- a/MapControl/WinUI/MapControl.WinUI.csproj
+++ b/MapControl/WinUI/MapControl.WinUI.csproj
@@ -2,7 +2,6 @@
     <PropertyGroup>
         <TargetFramework>net9.0-windows10.0.17763.0</TargetFramework>
         <UseWinUI>true</UseWinUI>
-        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <DefineConstants>WINUI</DefineConstants>
         <RootNamespace>MapControl</RootNamespace>
         <AssemblyTitle>XAML Map Control Library for WinUI</AssemblyTitle>
diff --git a/MapProjections/UWP/MapProjections.UWP.csproj b/MapProjections/UWP/MapProjections.UWP.csproj
index 2dd1ff6c..ade3ccdb 100644
--- a/MapProjections/UWP/MapProjections.UWP.csproj
+++ b/MapProjections/UWP/MapProjections.UWP.csproj
@@ -3,8 +3,6 @@
         <TargetFramework>net9.0-windows10.0.26100.0</TargetFramework>
         <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
         <UseUwp>true</UseUwp>
-        <DisableRuntimeMarshalling>true</DisableRuntimeMarshalling>
-        <DefaultLanguage>en-US</DefaultLanguage>
         <DefineConstants>UWP</DefineConstants>
         <RootNamespace>MapControl.Projections</RootNamespace>
         <AssemblyTitle>XAML Map Control Projections Library for UWP</AssemblyTitle>
@@ -12,6 +10,8 @@
         <PackageId>XAML.MapControl.MapProjections.UWP</PackageId>
         <Title>$(AssemblyTitle)</Title>
         <Description>Map projections library for XAML Map Control, based on ProjNET4GeoAPI</Description>
+        <DisableRuntimeMarshalling>true</DisableRuntimeMarshalling>
+        <DefaultLanguage>en-US</DefaultLanguage>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/MapUiTools/UWP/MapUiTools.UWP.csproj b/MapUiTools/UWP/MapUiTools.UWP.csproj
index 761a4f6b..cc311997 100644
--- a/MapUiTools/UWP/MapUiTools.UWP.csproj
+++ b/MapUiTools/UWP/MapUiTools.UWP.csproj
@@ -3,11 +3,11 @@
         <TargetFramework>net9.0-windows10.0.26100.0</TargetFramework>
         <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
         <UseUwp>true</UseUwp>
-        <DisableRuntimeMarshalling>true</DisableRuntimeMarshalling>
-        <DefaultLanguage>en-US</DefaultLanguage>
         <DefineConstants>UWP</DefineConstants>
         <RootNamespace>MapControl.UiTools</RootNamespace>
         <AssemblyTitle>XAML Map Control UI Tools Library for UWP</AssemblyTitle>
+        <DisableRuntimeMarshalling>true</DisableRuntimeMarshalling>
+        <DefaultLanguage>en-US</DefaultLanguage>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/SampleApps/AvaloniaApp/AvaloniaApp.csproj b/SampleApps/AvaloniaApp/AvaloniaApp.csproj
index 069561bb..73f6d731 100644
--- a/SampleApps/AvaloniaApp/AvaloniaApp.csproj
+++ b/SampleApps/AvaloniaApp/AvaloniaApp.csproj
@@ -2,8 +2,9 @@
     <PropertyGroup>
         <OutputType>WinExe</OutputType>
         <TargetFramework>net9.0</TargetFramework>
-        <RootNamespace>SampleApplication</RootNamespace>
         <DefineConstants>AVALONIA</DefineConstants>
+        <RootNamespace>SampleApplication</RootNamespace>
+        <AssemblyTitle>XAML Map Control Avalonia Sample Application</AssemblyTitle>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/SampleApps/UniversalApp/UniversalApp.csproj b/SampleApps/UniversalApp/UniversalApp.csproj
index 5eae2023..6c7aeec4 100644
--- a/SampleApps/UniversalApp/UniversalApp.csproj
+++ b/SampleApps/UniversalApp/UniversalApp.csproj
@@ -3,14 +3,16 @@
         <OutputType>WinExe</OutputType>
         <TargetFramework>net9.0-windows10.0.26100.0</TargetFramework>
         <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
-        <UseUwp>true</UseUwp>
-        <Platforms>x86;x64;arm64</Platforms>
         <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
+        <Platforms>x86;x64;arm64</Platforms>
         <PublishProfile>win-$(Platform).pubxml</PublishProfile>
+        <UseUwp>true</UseUwp>
+        <DefineConstants>UWP</DefineConstants>
+        <RootNamespace>SampleApplication</RootNamespace>
+        <AssemblyTitle>XAML Map Control UWP Sample Application</AssemblyTitle>
+        <EnableMsixTooling>true</EnableMsixTooling>
         <DefaultLanguage>en-US</DefaultLanguage>
         <DisableRuntimeMarshalling>true</DisableRuntimeMarshalling>
-        <EnableMsixTooling>true</EnableMsixTooling>
-        <DefineConstants>UWP</DefineConstants>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/SampleApps/WinUiApp/WinUiApp.csproj b/SampleApps/WinUiApp/WinUiApp.csproj
index c0271d95..b5fbb2cf 100644
--- a/SampleApps/WinUiApp/WinUiApp.csproj
+++ b/SampleApps/WinUiApp/WinUiApp.csproj
@@ -2,16 +2,15 @@
     <PropertyGroup>
         <OutputType>WinExe</OutputType>
         <TargetFramework>net9.0-windows10.0.17763.0</TargetFramework>
-        <Platforms>x86;x64;ARM64</Platforms>
         <RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
+        <Platforms>x86;x64;arm64</Platforms>
         <PublishProfile>win-$(Platform).pubxml</PublishProfile>
         <UseWinUI>true</UseWinUI>
-        <ApplicationManifest>app.manifest</ApplicationManifest>
+        <DefineConstants>WINUI</DefineConstants>
         <RootNamespace>SampleApplication</RootNamespace>
         <AssemblyTitle>XAML Map Control WinUI Sample Application</AssemblyTitle>
-        <AnalysisLevel>none</AnalysisLevel>
         <EnableMsixTooling>true</EnableMsixTooling>
-        <DefineConstants>WINUI</DefineConstants>
+        <ApplicationManifest>app.manifest</ApplicationManifest>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/SampleApps/WpfApplication/WpfApplication.csproj b/SampleApps/WpfApplication/WpfApplication.csproj
index 328c1bb3..038517b7 100644
--- a/SampleApps/WpfApplication/WpfApplication.csproj
+++ b/SampleApps/WpfApplication/WpfApplication.csproj
@@ -3,9 +3,9 @@
         <OutputType>WinExe</OutputType>
         <TargetFrameworks>net9.0-windows;net48</TargetFrameworks>
         <UseWPF>true</UseWPF>
+        <DefineConstants>WPF</DefineConstants>
         <RootNamespace>SampleApplication</RootNamespace>
         <AssemblyTitle>XAML Map Control WPF Sample Application</AssemblyTitle>
-        <DefineConstants>WPF</DefineConstants>
     </PropertyGroup>
 
     <ItemGroup>