From 9f61b90795c7d7e4ee12c2bc7231577ea1f731fd Mon Sep 17 00:00:00 2001 From: Clemens Date: Wed, 17 Nov 2021 23:17:11 +0100 Subject: [PATCH] Version 7.0: WinUI --- .../Shared/AutoEquirectangularProjection.cs | 2 +- .../Shared/AzimuthalEquidistantProjection.cs | 2 +- MapControl/Shared/AzimuthalProjection.cs | 2 +- MapControl/Shared/BindingHelper.cs | 2 +- MapControl/Shared/BingMapsTileLayer.cs | 2 +- MapControl/Shared/BoundingBox.cs | 2 +- .../Shared/EquirectangularProjection.cs | 2 +- MapControl/Shared/GnomonicProjection.cs | 2 +- MapControl/Shared/ImageLoader.cs | 2 +- MapControl/Shared/Intersections.cs | 2 +- MapControl/Shared/Location.cs | 2 +- MapControl/Shared/LocationCollection.cs | 2 +- MapControl/Shared/MapBase.cs | 2 +- MapControl/Shared/MapGraticule.cs | 2 +- MapControl/Shared/MapImageLayer.cs | 2 +- MapControl/Shared/MapItemsControl.cs | 2 +- MapControl/Shared/MapOverlay.cs | 2 +- MapControl/Shared/MapPanel.cs | 2 +- MapControl/Shared/MapPath.cs | 2 +- MapControl/Shared/MapPolygon.cs | 4 +- MapControl/Shared/MapPolyline.cs | 4 +- MapControl/Shared/MapProjection.cs | 2 +- MapControl/Shared/MapScale.cs | 4 +- MapControl/Shared/MapTileLayer.cs | 2 +- MapControl/Shared/MapTileLayerBase.cs | 4 +- MapControl/Shared/OrthographicProjection.cs | 2 +- MapControl/Shared/StereographicProjection.cs | 2 +- MapControl/Shared/Tile.cs | 2 +- MapControl/Shared/TileSource.cs | 4 +- MapControl/Shared/ViewTransform.cs | 2 +- MapControl/Shared/WebMercatorProjection.cs | 2 +- MapControl/Shared/WmsImageLayer.cs | 2 +- MapControl/Shared/WmtsCapabilities.cs | 2 +- MapControl/Shared/WmtsTileLayer.cs | 2 +- MapControl/Shared/WmtsTileMatrix.cs | 2 +- MapControl/Shared/WmtsTileMatrixLayer.cs | 2 +- MapControl/Shared/WorldMercatorProjection.cs | 2 +- MapControl/UWP/MapControl.UWP.csproj | 64 ++++++++++++++----- MapControl/UWP/Properties/AssemblyInfo.cs | 4 +- MapControl/WPF/MapControl.WPF.csproj | 14 +--- .../Animatable.WinUI.cs} | 0 .../ImageFileCache.WinUI.cs} | 0 .../ImageLoader.WinUI.cs} | 0 .../{UWP/Map.UWP.cs => WinUI/Map.WinUI.cs} | 0 .../MapBase.UWP.cs => WinUI/MapBase.WinUI.cs} | 0 .../MapContentControl.WinUI.cs} | 0 MapControl/WinUI/MapControl.WinUI.csproj | 9 +-- .../MapGraticule.WinUI.cs} | 0 .../MapItemsControl.WinUI.cs} | 0 .../MapOverlay.WinUI.cs} | 0 .../MapPanel.WinUI.cs} | 0 .../MapPath.UWP.cs => WinUI/MapPath.WinUI.cs} | 0 .../Matrix.UWP.cs => WinUI/Matrix.WinUI.cs} | 0 .../Point.UWP.cs => WinUI/Point.WinUI.cs} | 0 .../{UWP/Tile.UWP.cs => WinUI/Tile.WinUI.cs} | 0 .../Vector.UWP.cs => WinUI/Vector.WinUI.cs} | 0 56 files changed, 94 insertions(+), 81 deletions(-) rename MapControl/{UWP/Animatable.UWP.cs => WinUI/Animatable.WinUI.cs} (100%) rename MapControl/{UWP/ImageFileCache.UWP.cs => WinUI/ImageFileCache.WinUI.cs} (100%) rename MapControl/{UWP/ImageLoader.UWP.cs => WinUI/ImageLoader.WinUI.cs} (100%) rename MapControl/{UWP/Map.UWP.cs => WinUI/Map.WinUI.cs} (100%) rename MapControl/{UWP/MapBase.UWP.cs => WinUI/MapBase.WinUI.cs} (100%) rename MapControl/{UWP/MapContentControl.UWP.cs => WinUI/MapContentControl.WinUI.cs} (100%) rename MapControl/{UWP/MapGraticule.UWP.cs => WinUI/MapGraticule.WinUI.cs} (100%) rename MapControl/{UWP/MapItemsControl.UWP.cs => WinUI/MapItemsControl.WinUI.cs} (100%) rename MapControl/{UWP/MapOverlay.UWP.cs => WinUI/MapOverlay.WinUI.cs} (100%) rename MapControl/{UWP/MapPanel.UWP.cs => WinUI/MapPanel.WinUI.cs} (100%) rename MapControl/{UWP/MapPath.UWP.cs => WinUI/MapPath.WinUI.cs} (100%) rename MapControl/{UWP/Matrix.UWP.cs => WinUI/Matrix.WinUI.cs} (100%) rename MapControl/{UWP/Point.UWP.cs => WinUI/Point.WinUI.cs} (100%) rename MapControl/{UWP/Tile.UWP.cs => WinUI/Tile.WinUI.cs} (100%) rename MapControl/{UWP/Vector.UWP.cs => WinUI/Vector.WinUI.cs} (100%) diff --git a/MapControl/Shared/AutoEquirectangularProjection.cs b/MapControl/Shared/AutoEquirectangularProjection.cs index 0543ce5c..80ec7225 100644 --- a/MapControl/Shared/AutoEquirectangularProjection.cs +++ b/MapControl/Shared/AutoEquirectangularProjection.cs @@ -3,7 +3,7 @@ // Licensed under the Microsoft Public License (Ms-PL) using System; -#if !WINUI && !WINDOWS_UWP +#if !WINUI && !UWP using System.Windows; #endif diff --git a/MapControl/Shared/AzimuthalEquidistantProjection.cs b/MapControl/Shared/AzimuthalEquidistantProjection.cs index 41142480..b0909117 100644 --- a/MapControl/Shared/AzimuthalEquidistantProjection.cs +++ b/MapControl/Shared/AzimuthalEquidistantProjection.cs @@ -3,7 +3,7 @@ // Licensed under the Microsoft Public License (Ms-PL) using System; -#if !WINUI && !WINDOWS_UWP +#if !WINUI && !UWP using System.Windows; #endif diff --git a/MapControl/Shared/AzimuthalProjection.cs b/MapControl/Shared/AzimuthalProjection.cs index 02d66b91..8c0df16b 100644 --- a/MapControl/Shared/AzimuthalProjection.cs +++ b/MapControl/Shared/AzimuthalProjection.cs @@ -3,7 +3,7 @@ // Licensed under the Microsoft Public License (Ms-PL) using System; -#if WINUI || WINDOWS_UWP +#if WINUI || UWP using Windows.Foundation; #else using System.Windows; diff --git a/MapControl/Shared/BindingHelper.cs b/MapControl/Shared/BindingHelper.cs index cd12509a..ef2c7b49 100644 --- a/MapControl/Shared/BindingHelper.cs +++ b/MapControl/Shared/BindingHelper.cs @@ -5,7 +5,7 @@ #if WINUI using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Data; -#elif WINDOWS_UWP +#elif UWP using Windows.UI.Xaml; using Windows.UI.Xaml.Data; #else diff --git a/MapControl/Shared/BingMapsTileLayer.cs b/MapControl/Shared/BingMapsTileLayer.cs index e7c00006..b10b7313 100644 --- a/MapControl/Shared/BingMapsTileLayer.cs +++ b/MapControl/Shared/BingMapsTileLayer.cs @@ -9,7 +9,7 @@ using System.Linq; using System.Xml.Linq; #if WINUI using Microsoft.UI.Xaml; -#elif WINDOWS_UWP +#elif UWP using Windows.UI.Xaml; #else using System.Windows; diff --git a/MapControl/Shared/BoundingBox.cs b/MapControl/Shared/BoundingBox.cs index fdf2b6a3..a7d80897 100644 --- a/MapControl/Shared/BoundingBox.cs +++ b/MapControl/Shared/BoundingBox.cs @@ -10,7 +10,7 @@ namespace MapControl /// /// A geographic bounding box with south and north latitude and west and east longitude values in degrees. /// -#if !WINDOWS_UWP +#if !UWP [System.ComponentModel.TypeConverter(typeof(BoundingBoxConverter))] #endif public class BoundingBox diff --git a/MapControl/Shared/EquirectangularProjection.cs b/MapControl/Shared/EquirectangularProjection.cs index 6701bd2b..e2da0cb9 100644 --- a/MapControl/Shared/EquirectangularProjection.cs +++ b/MapControl/Shared/EquirectangularProjection.cs @@ -4,7 +4,7 @@ using System; using System.Globalization; -#if WINUI || WINDOWS_UWP +#if WINUI || UWP using Windows.Foundation; #else using System.Windows; diff --git a/MapControl/Shared/GnomonicProjection.cs b/MapControl/Shared/GnomonicProjection.cs index 9c5683c3..65750d61 100644 --- a/MapControl/Shared/GnomonicProjection.cs +++ b/MapControl/Shared/GnomonicProjection.cs @@ -3,7 +3,7 @@ // Licensed under the Microsoft Public License (Ms-PL) using System; -#if !WINUI && !WINDOWS_UWP +#if !WINUI && !UWP using System.Windows; #endif diff --git a/MapControl/Shared/ImageLoader.cs b/MapControl/Shared/ImageLoader.cs index ffebcab1..749a48d5 100644 --- a/MapControl/Shared/ImageLoader.cs +++ b/MapControl/Shared/ImageLoader.cs @@ -11,7 +11,7 @@ using System.Threading.Tasks; #if WINUI using Microsoft.UI.Xaml.Media; using Microsoft.UI.Xaml.Media.Imaging; -#elif WINDOWS_UWP +#elif UWP using Windows.UI.Xaml.Media; using Windows.UI.Xaml.Media.Imaging; #else diff --git a/MapControl/Shared/Intersections.cs b/MapControl/Shared/Intersections.cs index 738f4d79..b5545bbc 100644 --- a/MapControl/Shared/Intersections.cs +++ b/MapControl/Shared/Intersections.cs @@ -3,7 +3,7 @@ // Licensed under the Microsoft Public License (Ms-PL) using System; -#if WINUI || WINDOWS_UWP +#if WINUI || UWP using Windows.Foundation; #else using System.Windows; diff --git a/MapControl/Shared/Location.cs b/MapControl/Shared/Location.cs index 3dc34ca2..35850057 100644 --- a/MapControl/Shared/Location.cs +++ b/MapControl/Shared/Location.cs @@ -10,7 +10,7 @@ namespace MapControl /// /// A geographic location with latitude and longitude values in degrees. /// -#if !WINDOWS_UWP +#if !UWP [System.ComponentModel.TypeConverter(typeof(LocationConverter))] #endif public class Location : IEquatable diff --git a/MapControl/Shared/LocationCollection.cs b/MapControl/Shared/LocationCollection.cs index 020e198b..bba41572 100644 --- a/MapControl/Shared/LocationCollection.cs +++ b/MapControl/Shared/LocationCollection.cs @@ -12,7 +12,7 @@ namespace MapControl /// A collection of Locations with support for string parsing /// and calculation of great circle and rhumb line locations. /// -#if !WINDOWS_UWP +#if !UWP [System.ComponentModel.TypeConverter(typeof(LocationCollectionConverter))] #endif public class LocationCollection : List diff --git a/MapControl/Shared/MapBase.cs b/MapControl/Shared/MapBase.cs index c5d19a3a..745e474a 100644 --- a/MapControl/Shared/MapBase.cs +++ b/MapControl/Shared/MapBase.cs @@ -8,7 +8,7 @@ using Windows.Foundation; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Media; using Microsoft.UI.Xaml.Media.Animation; -#elif WINDOWS_UWP +#elif UWP using Windows.Foundation; using Windows.UI.Xaml; using Windows.UI.Xaml.Media; diff --git a/MapControl/Shared/MapGraticule.cs b/MapControl/Shared/MapGraticule.cs index 19bcdb07..71bc8b88 100644 --- a/MapControl/Shared/MapGraticule.cs +++ b/MapControl/Shared/MapGraticule.cs @@ -6,7 +6,7 @@ using System; using System.Globalization; #if WINUI using Microsoft.UI.Xaml; -#elif WINDOWS_UWP +#elif UWP using Windows.UI.Xaml; #else using System.Windows; diff --git a/MapControl/Shared/MapImageLayer.cs b/MapControl/Shared/MapImageLayer.cs index e90513d1..f228beb3 100644 --- a/MapControl/Shared/MapImageLayer.cs +++ b/MapControl/Shared/MapImageLayer.cs @@ -13,7 +13,7 @@ using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Media; using Microsoft.UI.Xaml.Media.Animation; -#elif WINDOWS_UWP +#elif UWP using Windows.Foundation; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; diff --git a/MapControl/Shared/MapItemsControl.cs b/MapControl/Shared/MapItemsControl.cs index ac8791ef..f104c16f 100644 --- a/MapControl/Shared/MapItemsControl.cs +++ b/MapControl/Shared/MapItemsControl.cs @@ -8,7 +8,7 @@ using Windows.Foundation; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Data; -#elif WINDOWS_UWP +#elif UWP using Windows.Foundation; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; diff --git a/MapControl/Shared/MapOverlay.cs b/MapControl/Shared/MapOverlay.cs index cbdc2be5..3963bd81 100644 --- a/MapControl/Shared/MapOverlay.cs +++ b/MapControl/Shared/MapOverlay.cs @@ -5,7 +5,7 @@ #if WINUI using Microsoft.UI.Xaml.Media; using Windows.UI.Text; -#elif WINDOWS_UWP +#elif UWP using Windows.UI.Text; using Windows.UI.Xaml.Media; #else diff --git a/MapControl/Shared/MapPanel.cs b/MapControl/Shared/MapPanel.cs index 3fd14ede..7ac9e2ce 100644 --- a/MapControl/Shared/MapPanel.cs +++ b/MapControl/Shared/MapPanel.cs @@ -9,7 +9,7 @@ using Windows.Foundation; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Media; -#elif WINDOWS_UWP +#elif UWP using Windows.Foundation; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; diff --git a/MapControl/Shared/MapPath.cs b/MapControl/Shared/MapPath.cs index d6d938c4..2ba13619 100644 --- a/MapControl/Shared/MapPath.cs +++ b/MapControl/Shared/MapPath.cs @@ -5,7 +5,7 @@ #if WINUI using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Media; -#elif WINDOWS_UWP +#elif UWP using Windows.UI.Xaml; using Windows.UI.Xaml.Media; #else diff --git a/MapControl/Shared/MapPolygon.cs b/MapControl/Shared/MapPolygon.cs index ff137694..a6740f2b 100644 --- a/MapControl/Shared/MapPolygon.cs +++ b/MapControl/Shared/MapPolygon.cs @@ -7,7 +7,7 @@ using System.Linq; #if WINUI using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Media; -#elif WINDOWS_UWP +#elif UWP using Windows.UI.Xaml; using Windows.UI.Xaml.Media; #else @@ -29,7 +29,7 @@ namespace MapControl /// /// Gets or sets the Locations that define the polygon points. /// -#if !WINDOWS_UWP +#if !UWP [System.ComponentModel.TypeConverter(typeof(LocationCollectionConverter))] #endif public IEnumerable Locations diff --git a/MapControl/Shared/MapPolyline.cs b/MapControl/Shared/MapPolyline.cs index 57d48895..c160c914 100644 --- a/MapControl/Shared/MapPolyline.cs +++ b/MapControl/Shared/MapPolyline.cs @@ -7,7 +7,7 @@ using System.Linq; #if WINUI using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Media; -#elif WINDOWS_UWP +#elif UWP using Windows.UI.Xaml; using Windows.UI.Xaml.Media; #else @@ -29,7 +29,7 @@ namespace MapControl /// /// Gets or sets the Locations that define the polyline points. /// -#if !WINDOWS_UWP +#if !UWP [System.ComponentModel.TypeConverter(typeof(LocationCollectionConverter))] #endif public IEnumerable Locations diff --git a/MapControl/Shared/MapProjection.cs b/MapControl/Shared/MapProjection.cs index a80208be..1073bdeb 100644 --- a/MapControl/Shared/MapProjection.cs +++ b/MapControl/Shared/MapProjection.cs @@ -4,7 +4,7 @@ using System; using System.Globalization; -#if WINUI || WINDOWS_UWP +#if WINUI || UWP using Windows.Foundation; #else using System.Windows; diff --git a/MapControl/Shared/MapScale.cs b/MapControl/Shared/MapScale.cs index 4faa90f9..2fe66aa4 100644 --- a/MapControl/Shared/MapScale.cs +++ b/MapControl/Shared/MapScale.cs @@ -10,7 +10,7 @@ using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Media; using Microsoft.UI.Xaml.Shapes; -#elif WINDOWS_UWP +#elif UWP using Windows.Foundation; using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; @@ -48,7 +48,7 @@ namespace MapControl line.SetBinding(Shape.StrokeProperty, this.GetBinding(nameof(Stroke))); line.SetBinding(Shape.StrokeThicknessProperty, this.GetBinding(nameof(StrokeThickness))); -#if WINUI || WINDOWS_UWP +#if WINUI || UWP label.SetBinding(TextBlock.ForegroundProperty, this.GetBinding(nameof(Foreground))); #endif Children.Add(line); diff --git a/MapControl/Shared/MapTileLayer.cs b/MapControl/Shared/MapTileLayer.cs index 8d30dba1..f51f3575 100644 --- a/MapControl/Shared/MapTileLayer.cs +++ b/MapControl/Shared/MapTileLayer.cs @@ -10,7 +10,7 @@ using System.Threading.Tasks; using Windows.Foundation; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Media; -#elif WINDOWS_UWP +#elif UWP using Windows.Foundation; using Windows.UI.Xaml; using Windows.UI.Xaml.Media; diff --git a/MapControl/Shared/MapTileLayerBase.cs b/MapControl/Shared/MapTileLayerBase.cs index 2743fc15..7419d16b 100644 --- a/MapControl/Shared/MapTileLayerBase.cs +++ b/MapControl/Shared/MapTileLayerBase.cs @@ -10,7 +10,7 @@ using Microsoft.UI.Dispatching; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Media; -#elif WINDOWS_UWP +#elif UWP using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; using Windows.UI.Xaml.Media; @@ -75,7 +75,7 @@ namespace MapControl updateTimer.Interval = UpdateInterval; updateTimer.Tick += async (s, e) => await Update(); -#if WINUI || WINDOWS_UWP +#if WINUI || UWP MapPanel.InitMapElement(this); #endif } diff --git a/MapControl/Shared/OrthographicProjection.cs b/MapControl/Shared/OrthographicProjection.cs index b5a57b23..ed4fa9ef 100644 --- a/MapControl/Shared/OrthographicProjection.cs +++ b/MapControl/Shared/OrthographicProjection.cs @@ -3,7 +3,7 @@ // Licensed under the Microsoft Public License (Ms-PL) using System; -#if !WINUI && !WINDOWS_UWP +#if !WINUI && !UWP using System.Windows; #endif diff --git a/MapControl/Shared/StereographicProjection.cs b/MapControl/Shared/StereographicProjection.cs index defb63ea..ef9cc56a 100644 --- a/MapControl/Shared/StereographicProjection.cs +++ b/MapControl/Shared/StereographicProjection.cs @@ -3,7 +3,7 @@ // Licensed under the Microsoft Public License (Ms-PL) using System; -#if !WINUI && !WINDOWS_UWP +#if !WINUI && !UWP using System.Windows; #endif diff --git a/MapControl/Shared/Tile.cs b/MapControl/Shared/Tile.cs index 42f6f6e4..e564df08 100644 --- a/MapControl/Shared/Tile.cs +++ b/MapControl/Shared/Tile.cs @@ -7,7 +7,7 @@ using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Media; using Microsoft.UI.Xaml.Media.Animation; -#elif WINDOWS_UWP +#elif UWP using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; using Windows.UI.Xaml.Media; diff --git a/MapControl/Shared/TileSource.cs b/MapControl/Shared/TileSource.cs index 1f1f738c..d1d69629 100644 --- a/MapControl/Shared/TileSource.cs +++ b/MapControl/Shared/TileSource.cs @@ -6,7 +6,7 @@ using System; using System.Threading.Tasks; #if WINUI using Microsoft.UI.Xaml.Media; -#elif WINDOWS_UWP +#elif UWP using Windows.UI.Xaml.Media; #else using System.Windows.Media; @@ -17,7 +17,7 @@ namespace MapControl /// /// Provides the download Uri or ImageSource of map tiles. /// -#if !WINDOWS_UWP +#if !UWP [System.ComponentModel.TypeConverter(typeof(TileSourceConverter))] #endif public class TileSource diff --git a/MapControl/Shared/ViewTransform.cs b/MapControl/Shared/ViewTransform.cs index 78144ced..db0fe4d4 100644 --- a/MapControl/Shared/ViewTransform.cs +++ b/MapControl/Shared/ViewTransform.cs @@ -6,7 +6,7 @@ using System; #if WINUI using Windows.Foundation; using Microsoft.UI.Xaml.Media; -#elif WINDOWS_UWP +#elif UWP using Windows.Foundation; using Windows.UI.Xaml.Media; #else diff --git a/MapControl/Shared/WebMercatorProjection.cs b/MapControl/Shared/WebMercatorProjection.cs index 9b87a982..24eaf1dc 100644 --- a/MapControl/Shared/WebMercatorProjection.cs +++ b/MapControl/Shared/WebMercatorProjection.cs @@ -3,7 +3,7 @@ // Licensed under the Microsoft Public License (Ms-PL) using System; -#if !WINUI && !WINDOWS_UWP +#if !WINUI && !UWP using System.Windows; #endif diff --git a/MapControl/Shared/WmsImageLayer.cs b/MapControl/Shared/WmsImageLayer.cs index a1f52c67..51f79070 100644 --- a/MapControl/Shared/WmsImageLayer.cs +++ b/MapControl/Shared/WmsImageLayer.cs @@ -12,7 +12,7 @@ using System.Xml.Linq; using Windows.Foundation; using Microsoft.UI.Xaml; using Microsoft.UI.Xaml.Media; -#elif WINDOWS_UWP +#elif UWP using Windows.Foundation; using Windows.UI.Xaml; using Windows.UI.Xaml.Media; diff --git a/MapControl/Shared/WmtsCapabilities.cs b/MapControl/Shared/WmtsCapabilities.cs index 752e745c..80ac0d80 100644 --- a/MapControl/Shared/WmtsCapabilities.cs +++ b/MapControl/Shared/WmtsCapabilities.cs @@ -8,7 +8,7 @@ using System.Globalization; using System.Linq; using System.Xml.Linq; using System.Threading.Tasks; -#if !WINUI && !WINDOWS_UWP +#if !WINUI && !UWP using System.Windows; #endif diff --git a/MapControl/Shared/WmtsTileLayer.cs b/MapControl/Shared/WmtsTileLayer.cs index d10520ff..242ede05 100644 --- a/MapControl/Shared/WmtsTileLayer.cs +++ b/MapControl/Shared/WmtsTileLayer.cs @@ -10,7 +10,7 @@ using System.Threading.Tasks; #if WINUI using Windows.Foundation; using Microsoft.UI.Xaml; -#elif WINDOWS_UWP +#elif UWP using Windows.Foundation; using Windows.UI.Xaml; #else diff --git a/MapControl/Shared/WmtsTileMatrix.cs b/MapControl/Shared/WmtsTileMatrix.cs index 0c479355..0cb536ee 100644 --- a/MapControl/Shared/WmtsTileMatrix.cs +++ b/MapControl/Shared/WmtsTileMatrix.cs @@ -2,7 +2,7 @@ // © 2021 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) -#if !WINUI && !WINDOWS_UWP +#if !WINUI && !UWP using System.Windows; #endif diff --git a/MapControl/Shared/WmtsTileMatrixLayer.cs b/MapControl/Shared/WmtsTileMatrixLayer.cs index 3b54fa0a..b599054a 100644 --- a/MapControl/Shared/WmtsTileMatrixLayer.cs +++ b/MapControl/Shared/WmtsTileMatrixLayer.cs @@ -9,7 +9,7 @@ using System.Linq; using Windows.Foundation; using Microsoft.UI.Xaml.Controls; using Microsoft.UI.Xaml.Media; -#elif WINDOWS_UWP +#elif UWP using Windows.Foundation; using Windows.UI.Xaml.Controls; using Windows.UI.Xaml.Media; diff --git a/MapControl/Shared/WorldMercatorProjection.cs b/MapControl/Shared/WorldMercatorProjection.cs index 0ef618bf..45b020e7 100644 --- a/MapControl/Shared/WorldMercatorProjection.cs +++ b/MapControl/Shared/WorldMercatorProjection.cs @@ -3,7 +3,7 @@ // Licensed under the Microsoft Public License (Ms-PL) using System; -#if !WINUI && !WINDOWS_UWP +#if !WINUI && !UWP using System.Windows; #endif diff --git a/MapControl/UWP/MapControl.UWP.csproj b/MapControl/UWP/MapControl.UWP.csproj index 57d4d4b9..c01b17d1 100644 --- a/MapControl/UWP/MapControl.UWP.csproj +++ b/MapControl/UWP/MapControl.UWP.csproj @@ -23,7 +23,7 @@ full false bin\Debug\ - DEBUG;WINDOWS_UWP + DEBUG;UWP prompt 4 @@ -32,7 +32,7 @@ none true bin\Release\ - WINDOWS_UWP + UWP prompt 4 true @@ -182,23 +182,53 @@ WorldMercatorProjection.cs - - - - - - - - - - - + + Animatable.WinUI.cs + + + ImageFileCache.WinUI.cs + + + ImageLoader.WinUI.cs + + + Map.WinUI.cs + + + MapBase.WinUI.cs + + + MapContentControl.WinUI.cs + + + MapGraticule.WinUI.cs + + + MapItemsControl.WinUI.cs + + + MapOverlay.WinUI.cs + + + MapPanel.WinUI.cs + + + MapPath.WinUI.cs + + + Matrix.WinUI.cs + + + Point.WinUI.cs + + + Tile.WinUI.cs + + + Vector.WinUI.cs + - - - - diff --git a/MapControl/UWP/Properties/AssemblyInfo.cs b/MapControl/UWP/Properties/AssemblyInfo.cs index 96c4084f..2a97d1b1 100644 --- a/MapControl/UWP/Properties/AssemblyInfo.cs +++ b/MapControl/UWP/Properties/AssemblyInfo.cs @@ -7,8 +7,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © 2021 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("6.1.0")] -[assembly: AssemblyFileVersion("6.1.0")] +[assembly: AssemblyVersion("7.0.0")] +[assembly: AssemblyFileVersion("7.0.0")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/MapControl/WPF/MapControl.WPF.csproj b/MapControl/WPF/MapControl.WPF.csproj index 17852922..14e0e091 100644 --- a/MapControl/WPF/MapControl.WPF.csproj +++ b/MapControl/WPF/MapControl.WPF.csproj @@ -7,7 +7,7 @@ ..\..\MapControl.snk false XAML Map Control - 6.1.0 + 7.0.0 XAML Map Control Library Clemens Fischer Copyright © 2021 Clemens Fischer @@ -15,18 +15,6 @@ XAML.MapControl - - none - false - - - - - full - true - DEBUG - - diff --git a/MapControl/UWP/Animatable.UWP.cs b/MapControl/WinUI/Animatable.WinUI.cs similarity index 100% rename from MapControl/UWP/Animatable.UWP.cs rename to MapControl/WinUI/Animatable.WinUI.cs diff --git a/MapControl/UWP/ImageFileCache.UWP.cs b/MapControl/WinUI/ImageFileCache.WinUI.cs similarity index 100% rename from MapControl/UWP/ImageFileCache.UWP.cs rename to MapControl/WinUI/ImageFileCache.WinUI.cs diff --git a/MapControl/UWP/ImageLoader.UWP.cs b/MapControl/WinUI/ImageLoader.WinUI.cs similarity index 100% rename from MapControl/UWP/ImageLoader.UWP.cs rename to MapControl/WinUI/ImageLoader.WinUI.cs diff --git a/MapControl/UWP/Map.UWP.cs b/MapControl/WinUI/Map.WinUI.cs similarity index 100% rename from MapControl/UWP/Map.UWP.cs rename to MapControl/WinUI/Map.WinUI.cs diff --git a/MapControl/UWP/MapBase.UWP.cs b/MapControl/WinUI/MapBase.WinUI.cs similarity index 100% rename from MapControl/UWP/MapBase.UWP.cs rename to MapControl/WinUI/MapBase.WinUI.cs diff --git a/MapControl/UWP/MapContentControl.UWP.cs b/MapControl/WinUI/MapContentControl.WinUI.cs similarity index 100% rename from MapControl/UWP/MapContentControl.UWP.cs rename to MapControl/WinUI/MapContentControl.WinUI.cs diff --git a/MapControl/WinUI/MapControl.WinUI.csproj b/MapControl/WinUI/MapControl.WinUI.csproj index cf1e3ec5..f243f098 100644 --- a/MapControl/WinUI/MapControl.WinUI.csproj +++ b/MapControl/WinUI/MapControl.WinUI.csproj @@ -9,7 +9,7 @@ ..\..\MapControl.snk false XAML Map Control - 6.1.0 + 7.0.0 XAML Map Control Library Clemens Fischer Copyright © 2021 Clemens Fischer @@ -18,7 +18,7 @@ - DEBUG;WINUI + WINUI @@ -31,11 +31,6 @@ - - - - - diff --git a/MapControl/UWP/MapGraticule.UWP.cs b/MapControl/WinUI/MapGraticule.WinUI.cs similarity index 100% rename from MapControl/UWP/MapGraticule.UWP.cs rename to MapControl/WinUI/MapGraticule.WinUI.cs diff --git a/MapControl/UWP/MapItemsControl.UWP.cs b/MapControl/WinUI/MapItemsControl.WinUI.cs similarity index 100% rename from MapControl/UWP/MapItemsControl.UWP.cs rename to MapControl/WinUI/MapItemsControl.WinUI.cs diff --git a/MapControl/UWP/MapOverlay.UWP.cs b/MapControl/WinUI/MapOverlay.WinUI.cs similarity index 100% rename from MapControl/UWP/MapOverlay.UWP.cs rename to MapControl/WinUI/MapOverlay.WinUI.cs diff --git a/MapControl/UWP/MapPanel.UWP.cs b/MapControl/WinUI/MapPanel.WinUI.cs similarity index 100% rename from MapControl/UWP/MapPanel.UWP.cs rename to MapControl/WinUI/MapPanel.WinUI.cs diff --git a/MapControl/UWP/MapPath.UWP.cs b/MapControl/WinUI/MapPath.WinUI.cs similarity index 100% rename from MapControl/UWP/MapPath.UWP.cs rename to MapControl/WinUI/MapPath.WinUI.cs diff --git a/MapControl/UWP/Matrix.UWP.cs b/MapControl/WinUI/Matrix.WinUI.cs similarity index 100% rename from MapControl/UWP/Matrix.UWP.cs rename to MapControl/WinUI/Matrix.WinUI.cs diff --git a/MapControl/UWP/Point.UWP.cs b/MapControl/WinUI/Point.WinUI.cs similarity index 100% rename from MapControl/UWP/Point.UWP.cs rename to MapControl/WinUI/Point.WinUI.cs diff --git a/MapControl/UWP/Tile.UWP.cs b/MapControl/WinUI/Tile.WinUI.cs similarity index 100% rename from MapControl/UWP/Tile.UWP.cs rename to MapControl/WinUI/Tile.WinUI.cs diff --git a/MapControl/UWP/Vector.UWP.cs b/MapControl/WinUI/Vector.WinUI.cs similarity index 100% rename from MapControl/UWP/Vector.UWP.cs rename to MapControl/WinUI/Vector.WinUI.cs