diff --git a/FileDbCache/WPF/FileDbCache.WPF.csproj b/FileDbCache/WPF/FileDbCache.WPF.csproj
index 991508c5..a2667778 100644
--- a/FileDbCache/WPF/FileDbCache.WPF.csproj
+++ b/FileDbCache/WPF/FileDbCache.WPF.csproj
@@ -1,6 +1,6 @@
- net7.0-windows;net6.0-windows;net48;net462
+ net8.0-windows;net7.0-windows;net6.0-windows;net48;net462
true
MapControl.Caching
XAML Map Control FileDbCache Library for WPF
@@ -24,13 +24,15 @@
-
-
-
+
+
-
+
+
+
+
diff --git a/FileDbCache/WinUI/FileDbCache.WinUI.csproj b/FileDbCache/WinUI/FileDbCache.WinUI.csproj
index 4ac85702..19c4fc50 100644
--- a/FileDbCache/WinUI/FileDbCache.WinUI.csproj
+++ b/FileDbCache/WinUI/FileDbCache.WinUI.csproj
@@ -1,7 +1,8 @@
- net7.0-windows10.0.17763.0;net6.0-windows10.0.17763.0
+ net8.0-windows10.0.17763.0;net7.0-windows10.0.17763.0;net6.0-windows10.0.17763.0
win10-x86;win10-x64;win10-arm64
+ true
true
MapControl.Caching
XAML Map Control FileDbCache Library for WinUI
@@ -27,8 +28,8 @@
-
-
+
+
diff --git a/MBTiles/Shared/MBTileLayer.cs b/MBTiles/Shared/MBTileLayer.cs
index 31fdb1a1..d275ca1b 100644
--- a/MBTiles/Shared/MBTileLayer.cs
+++ b/MBTiles/Shared/MBTileLayer.cs
@@ -22,16 +22,6 @@ namespace MapControl.MBTiles
nameof(File), typeof(string), typeof(MBTileLayer),
new PropertyMetadata(null, async (o, e) => await ((MBTileLayer)o).FilePropertyChanged((string)e.NewValue)));
- public MBTileLayer()
- : this(new TileImageLoader())
- {
- }
-
- public MBTileLayer(ITileImageLoader tileImageLoader)
- : base(tileImageLoader)
- {
- }
-
public string File
{
get => (string)GetValue(FileProperty);
diff --git a/MBTiles/WinUI/MBTiles.WinUI.csproj b/MBTiles/WinUI/MBTiles.WinUI.csproj
index fc054ce3..4e1d52d2 100644
--- a/MBTiles/WinUI/MBTiles.WinUI.csproj
+++ b/MBTiles/WinUI/MBTiles.WinUI.csproj
@@ -1,7 +1,8 @@
- net7.0-windows10.0.17763.0;net6.0-windows10.0.17763.0
+ net8.0-windows10.0.17763.0;net7.0-windows10.0.17763.0;net6.0-windows10.0.17763.0
win10-x86;win10-x64;win10-arm64
+ true
true
MapControl.MBTiles
XAML Map Control MBTiles Library for WinUI
@@ -26,8 +27,8 @@
-
-
+
+
diff --git a/MapControl/WPF/MapControl.WPF.csproj b/MapControl/WPF/MapControl.WPF.csproj
index 787ef7bf..fd136976 100644
--- a/MapControl/WPF/MapControl.WPF.csproj
+++ b/MapControl/WPF/MapControl.WPF.csproj
@@ -1,6 +1,6 @@
- net7.0-windows;net6.0-windows;net48;net462
+ net8.0-windows;net7.0-windows;net6.0-windows;net48;net462
true
MapControl
XAML Map Control Library for WPF
@@ -24,8 +24,8 @@
-
-
+
+
diff --git a/MapControl/WinUI/ImageLoader.WinUI.cs b/MapControl/WinUI/ImageLoader.WinUI.cs
index 345900d5..7fcd2487 100644
--- a/MapControl/WinUI/ImageLoader.WinUI.cs
+++ b/MapControl/WinUI/ImageLoader.WinUI.cs
@@ -21,18 +21,6 @@ namespace MapControl
{
public static partial class ImageLoader
{
-#if false
- public static async Task LoadImageAsync(BitmapDecoder decoder)
- {
- var image = new SoftwareBitmapSource();
- var bitmap = await decoder.GetSoftwareBitmapAsync(
- BitmapPixelFormat.Bgra8, BitmapAlphaMode.Premultiplied, new BitmapTransform(),
- ExifOrientationMode.IgnoreExifOrientation, ColorManagementMode.DoNotColorManage);
-
- await image.SetBitmapAsync(bitmap);
- return image;
- }
-#else
public static async Task LoadImageAsync(BitmapDecoder decoder)
{
var image = new WriteableBitmap((int)decoder.PixelWidth, (int)decoder.PixelHeight);
@@ -43,7 +31,7 @@ namespace MapControl
pixelData.DetachPixelData().CopyTo(image.PixelBuffer);
return image;
}
-#endif
+
public static async Task LoadImageAsync(IRandomAccessStream stream)
{
// WinUI BitmapImage produces visual artifacts with Bing Maps Aerial (or all JPEG?)
diff --git a/MapControl/WinUI/MapControl.WinUI.csproj b/MapControl/WinUI/MapControl.WinUI.csproj
index 1a407e87..c9113d32 100644
--- a/MapControl/WinUI/MapControl.WinUI.csproj
+++ b/MapControl/WinUI/MapControl.WinUI.csproj
@@ -1,7 +1,8 @@
- net7.0-windows10.0.17763.0;net6.0-windows10.0.17763.0
+ net8.0-windows10.0.17763.0;net7.0-windows10.0.17763.0;net6.0-windows10.0.17763.0
win10-x86;win10-x64;win10-arm64
+ true
true
MapControl
XAML Map Control Library for WinUI
@@ -26,7 +27,7 @@
-
-
+
+
diff --git a/MapProjections/WPF/MapProjections.WPF.csproj b/MapProjections/WPF/MapProjections.WPF.csproj
index 1e29e299..8eb57091 100644
--- a/MapProjections/WPF/MapProjections.WPF.csproj
+++ b/MapProjections/WPF/MapProjections.WPF.csproj
@@ -1,6 +1,6 @@
- net7.0-windows;net6.0-windows;net48;net462
+ net8.0-windows;net7.0-windows;net6.0-windows;net48;net462
true
MapControl.Projections
XAML Map Control Projections Library for WPF
diff --git a/MapProjections/WinUI/MapProjections.WinUI.csproj b/MapProjections/WinUI/MapProjections.WinUI.csproj
index cdd05e2c..4a6d600f 100644
--- a/MapProjections/WinUI/MapProjections.WinUI.csproj
+++ b/MapProjections/WinUI/MapProjections.WinUI.csproj
@@ -1,7 +1,8 @@
- net7.0-windows10.0.17763.0;net6.0-windows10.0.17763.0
+ net8.0-windows10.0.17763.0;net7.0-windows10.0.17763.0;net6.0-windows10.0.17763.0
win10-x86;win10-x64;win10-arm64
+ true
true
MapControl.Projections
XAML Map Control Projections Library for WinUI
@@ -26,8 +27,8 @@
-
-
+
+
diff --git a/MapUiTools/WPF/MapUiTools.WPF.csproj b/MapUiTools/WPF/MapUiTools.WPF.csproj
index 56d4a46a..f4c82df3 100644
--- a/MapUiTools/WPF/MapUiTools.WPF.csproj
+++ b/MapUiTools/WPF/MapUiTools.WPF.csproj
@@ -1,6 +1,6 @@
- net7.0-windows;net6.0-windows;net48;net462
+ net8.0-windows;net7.0-windows;net6.0-windows;net48;net462
true
MapControl.UiTools
XAML Map Control UI Tools Library for WPF
diff --git a/MapUiTools/WinUI/MapUiTools.WinUI.csproj b/MapUiTools/WinUI/MapUiTools.WinUI.csproj
index 5307a28f..fd7281cd 100644
--- a/MapUiTools/WinUI/MapUiTools.WinUI.csproj
+++ b/MapUiTools/WinUI/MapUiTools.WinUI.csproj
@@ -1,7 +1,8 @@
- net7.0-windows10.0.17763.0;net6.0-windows10.0.17763.0
+ net8.0-windows10.0.17763.0;net7.0-windows10.0.17763.0;net6.0-windows10.0.17763.0
win10-x86;win10-x64;win10-arm64
+ true
true
MapControl.UiTools
XAML Map Control UI Tools Library for WinUI
@@ -24,8 +25,8 @@
-
-
+
+
diff --git a/SQLiteCache/WPF/SQLiteCache.WPF.csproj b/SQLiteCache/WPF/SQLiteCache.WPF.csproj
index 66255ff0..04b2d23b 100644
--- a/SQLiteCache/WPF/SQLiteCache.WPF.csproj
+++ b/SQLiteCache/WPF/SQLiteCache.WPF.csproj
@@ -1,6 +1,6 @@
- net7.0-windows;net6.0-windows;net48;net462
+ net8.0-windows;net7.0-windows;net6.0-windows;net48;net462
true
MapControl.Caching
XAML Map Control SQLiteCache Library for WPF
@@ -24,8 +24,8 @@
-
-
+
+
diff --git a/SQLiteCache/WinUI/SQLiteCache.WinUI.csproj b/SQLiteCache/WinUI/SQLiteCache.WinUI.csproj
index 9fcefd9e..90d1a4a3 100644
--- a/SQLiteCache/WinUI/SQLiteCache.WinUI.csproj
+++ b/SQLiteCache/WinUI/SQLiteCache.WinUI.csproj
@@ -1,7 +1,8 @@
- net7.0-windows10.0.17763.0;net6.0-windows10.0.17763.0
+ net8.0-windows10.0.17763.0;net7.0-windows10.0.17763.0;net6.0-windows10.0.17763.0
win10-x86;win10-x64;win10-arm64
+ true
true
MapControl.Caching
XAML Map Control SQLiteCache Library for WinUI
@@ -26,8 +27,8 @@
-
-
+
+
diff --git a/SampleApps/ProjectionDemo/ProjectionDemo.csproj b/SampleApps/ProjectionDemo/ProjectionDemo.csproj
index 96b2a86e..5b82c255 100644
--- a/SampleApps/ProjectionDemo/ProjectionDemo.csproj
+++ b/SampleApps/ProjectionDemo/ProjectionDemo.csproj
@@ -1,7 +1,7 @@
WinExe
- net7.0-windows
+ net8.0-windows
true
ProjectionDemo
XAML Map Control Projection Demo Application
diff --git a/SampleApps/WinUiApp/WinUiApp.csproj b/SampleApps/WinUiApp/WinUiApp.csproj
index 7d7c6602..61940bbe 100644
--- a/SampleApps/WinUiApp/WinUiApp.csproj
+++ b/SampleApps/WinUiApp/WinUiApp.csproj
@@ -1,10 +1,11 @@
WinExe
- net7.0-windows10.0.17763.0
+ net8.0-windows10.0.17763.0
x64
- win10-x86;win10-x64;win10-arm64
win10-$(Platform).pubxml
+ win10-x86;win10-x64;win10-arm64
+ true
true
app.manifest
SampleApplication
@@ -35,8 +36,8 @@
-
-
+
+
diff --git a/SampleApps/WpfApplication/WpfApplication.csproj b/SampleApps/WpfApplication/WpfApplication.csproj
index 67f2d8f0..2d76aec2 100644
--- a/SampleApps/WpfApplication/WpfApplication.csproj
+++ b/SampleApps/WpfApplication/WpfApplication.csproj
@@ -1,7 +1,7 @@
WinExe
- net7.0-windows;net48
+ net8.0-windows;net48
true
SampleApplication
XAML Map Control WPF Sample Application