- downgrade Mapsui to beta 17 to avoid beta 18 not working on android Mapsui/Mapsui#3051. Note that beta 17 only works on Android when using the Uno native renderer, not the Uno Skia renderer.

- fix targetframeworks to support Skia and Native renderers
- fix Windows PRI build errors in example

Author: VincentH-Net

src/CSharpMarkup.WinUI.Examples/Directory.Packages.props

@@ -11,13 +11,15 @@
   <ItemGroup>
     <PackageVersion Include="CSharpMarkup.WinUI" Version="3.1.2" />
     <PackageVersion Include="CSharpMarkup.WinUI.LiveChartsCore.SkiaSharpView" Version="3.1.2" />
-    <PackageVersion Include="CSharpMarkup.WinUI.Mapsui" Version="3.1.2" />
+    <PackageVersion Include="CSharpMarkup.WinUI.Mapsui" Version="3.1.2-beta.17.3" />
     <PackageVersion Include="CSharpMarkup.WinUI.ScottPlot" Version="3.1.2" />
     <PackageVersion Include="CSharpMarkup.WinUI.Uno.Extensions.Navigation" Version="3.1.2" />
     <PackageVersion Include="CSharpMarkup.WinUI.Uno.Extensions.Navigation.Toolkit" Version="3.1.2" />
     <PackageVersion Include="CSharpMarkup.WinUI.Uno.Toolkit" Version="3.1.2" />
-    <!-- Pinned for Mapsui; keep consistent with https://github.com/Mapsui/Mapsui/blob/main/Directory.Packages.props, TODO: remove when Uno SDK with SkiaRenderer feature depends on this or higher version -->
-    <PackageVersion Include="SkiaSharp.Views.Uno.WinUI" Version="3.119.0" />
-    <PackageVersion Include="SkiaSharp.Skottie" Version="3.119.0" />
+
+    <!-- Pinned to the version that Uno SDK implicitly references, to prevent PRI errors when building the Windows target.
+         Update versions when updating Uno SDK. -->
+    <PackageVersion Include="Uno.Toolkit.WinUI" Version="7.0.7" />
+    <PackageVersion Include="Uno.Extensions.Navigation.Toolkit.WinUI" Version="6.0.12" />
   </ItemGroup>
-</Project>
+</Project>

src/CSharpMarkup.WinUI.Mapsui/CSharpMarkup.WinUI.Mapsui.csproj

@@ -11,9 +11,6 @@
 		<EnableDefaultPageItems>false</EnableDefaultPageItems>
 		<UnoSingleProject>true</UnoSingleProject>
 		<OutputType>Library</OutputType>
-		<UnoFeatures>
-			SkiaRenderer;
-		</UnoFeatures>
 	</PropertyGroup>
 
 	<PropertyGroup>
@@ -33,7 +30,7 @@
 		<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
 		<RepositoryType>git</RepositoryType>
 		<Product>$(AssemblyName) ($(TargetFramework))</Product>
-		<Version>$(CSharpMarkupVersion)-beta.18</Version> <!-- Keep the beta version suffix equal to Mapsui 5.0.0-beta.<nr>, remove when out of beta -->
+		<Version>$(CSharpMarkupVersion)-beta.17.3</Version> <!-- Keep the beta version suffix equal to Mapsui 5.0.0-beta.<nr>, remove when out of beta -->
 		<NeutralLanguage>en</NeutralLanguage>
 
 		<NoWarn>CS1591;CS1573;Uno0001</NoWarn>
@@ -52,8 +49,8 @@
 	</PropertyGroup>
 
 	<PropertyGroup>
-		<TargetFrameworks>net8.0;net8.0-ios;net8.0-maccatalyst;net8.0-android;net8.0-windows10.0.19041;net8.0-browserwasm;net8.0-desktop;net9.0;net9.0-ios;net9.0-maccatalyst;net9.0-android;net9.0-browserwasm;net9.0-windows10.0.19041;net9.0-desktop</TargetFrameworks>
-		<!-- Identical to Mapsui.Uno.WinUI 5 target frameworks, see https://github.com/Mapsui/Mapsui/blob/main/Mapsui.UI.Uno.WinUI/Mapsui.UI.Uno.WinUI.csproj -->
+		<TargetFrameworks>net8.0;net8.0-ios17.0;net8.0-maccatalyst17.0;net8.0-android34.0;net8.0-windows10.0.19041.0;net9.0;net9.0-ios18.4;net9.0-maccatalyst18.4;net9.0-android35.0;net9.0-windows10.0.19041.0</TargetFrameworks>
+		<!-- Derived from Mapsui.Uno.WinUI 5 target frameworks, adjusted to C#M targetframeworks. See https://github.com/Mapsui/Mapsui/blob/main/Mapsui.UI.Uno.WinUI/Mapsui.UI.Uno.WinUI.csproj -->
 		<RootNamespace>CSharpMarkup.WinUI.Mapsui</RootNamespace>
 		<EnableDefaultPageItems>false</EnableDefaultPageItems>
 	</PropertyGroup>
@@ -66,8 +63,6 @@
 		<PackageReference Include="Mapsui.Uno.WinUI" />
 		<PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
 		<PackageReference Include="CSharpMarkup.WinUI" />
-		<PackageReference Include="SkiaSharp.Views.Uno.WinUI" />
-		<PackageReference Include="SkiaSharp.Skottie" />
 	</ItemGroup>
 
 	<ItemGroup>

src/CSharpMarkup.WinUI.Mapsui/Generated/SourceGenerators/SourceGenerators.CsMarkupApiSourceGenerator/UnoWinUI.NET8_0_Android.cs

@@ -37,6 +37,13 @@ public static MapControl MapControl()
             var ui = new Mui.MapControl();
             return CSharpMarkup.WinUI.Mapsui.MapControl.StartChain(ui);
         }
+
+        /// <summary>Create a <see cref="Mui.MapControl"/></summary>
+        public static MapControl MapControl(nint javaReference, Android.Runtime.JniHandleOwnership transfer)
+        {
+            var ui = new Mui.MapControl(javaReference, transfer);
+            return CSharpMarkup.WinUI.Mapsui.MapControl.StartChain(ui);
+        }
     }
 
     public partial class MapControl : Grid, IUI<Mui.MapControl>

src/CSharpMarkup.WinUI.Mapsui/Generated/SourceGenerators/SourceGenerators.CsMarkupApiSourceGenerator/UnoWinUI.NET8_0_BrowserWasm.cs

@@ -37,20 +37,6 @@ public static MapControl MapControl()
             var ui = new Mui.MapControl();
             return CSharpMarkup.WinUI.Mapsui.MapControl.StartChain(ui);
         }
-
-        /// <summary>Create a <see cref="Mui.MapControl"/></summary>
-        public static MapControl MapControl(nint handle)
-        {
-            var ui = new Mui.MapControl(handle);
-            return CSharpMarkup.WinUI.Mapsui.MapControl.StartChain(ui);
-        }
-
-        /// <summary>Create a <see cref="Mui.MapControl"/></summary>
-        public static MapControl MapControl(ObjCRuntime.NativeHandle handle)
-        {
-            var ui = new Mui.MapControl(handle);
-            return CSharpMarkup.WinUI.Mapsui.MapControl.StartChain(ui);
-        }
     }
 
     public partial class MapControl : Grid, IUI<Mui.MapControl>

src/CSharpMarkup.WinUI.Mapsui/Generated/SourceGenerators/SourceGenerators.CsMarkupApiSourceGenerator/UnoWinUI.NET8_0_Desktop.cs

@@ -37,6 +37,13 @@ public static MapControl MapControl()
             var ui = new Mui.MapControl();
             return CSharpMarkup.WinUI.Mapsui.MapControl.StartChain(ui);
         }
+
+        /// <summary>Create a <see cref="Mui.MapControl"/></summary>
+        public static MapControl MapControl(nint javaReference, Android.Runtime.JniHandleOwnership transfer)
+        {
+            var ui = new Mui.MapControl(javaReference, transfer);
+            return CSharpMarkup.WinUI.Mapsui.MapControl.StartChain(ui);
+        }
     }
 
     public partial class MapControl : Grid, IUI<Mui.MapControl>