diff --git a/Caching/FileDbCache.WPF/Properties/AssemblyInfo.cs b/Caching/FileDbCache.WPF/Properties/AssemblyInfo.cs index b8bb9509..f9580c29 100644 --- a/Caching/FileDbCache.WPF/Properties/AssemblyInfo.cs +++ b/Caching/FileDbCache.WPF/Properties/AssemblyInfo.cs @@ -7,8 +7,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("© 2015 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("2.7.1")] -[assembly: AssemblyFileVersion("2.7.1")] +[assembly: AssemblyVersion("2.7.2")] +[assembly: AssemblyFileVersion("2.7.2")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/Caching/FileDbCache.WinRT/Properties/AssemblyInfo.cs b/Caching/FileDbCache.WinRT/Properties/AssemblyInfo.cs index 9c601c38..bcc41ef3 100644 --- a/Caching/FileDbCache.WinRT/Properties/AssemblyInfo.cs +++ b/Caching/FileDbCache.WinRT/Properties/AssemblyInfo.cs @@ -7,8 +7,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("© 2015 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("2.7.1")] -[assembly: AssemblyFileVersion("2.7.1")] +[assembly: AssemblyVersion("2.7.2")] +[assembly: AssemblyFileVersion("2.7.2")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/Caching/ImageFileCache.WPF/Properties/AssemblyInfo.cs b/Caching/ImageFileCache.WPF/Properties/AssemblyInfo.cs index 2cf9bcf7..19ae587d 100644 --- a/Caching/ImageFileCache.WPF/Properties/AssemblyInfo.cs +++ b/Caching/ImageFileCache.WPF/Properties/AssemblyInfo.cs @@ -7,8 +7,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("© 2015 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("2.7.1")] -[assembly: AssemblyFileVersion("2.7.1")] +[assembly: AssemblyVersion("2.7.2")] +[assembly: AssemblyFileVersion("2.7.2")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/Caching/ImageFileCache.WinRT/Properties/AssemblyInfo.cs b/Caching/ImageFileCache.WinRT/Properties/AssemblyInfo.cs index 19b7f368..075639f7 100644 --- a/Caching/ImageFileCache.WinRT/Properties/AssemblyInfo.cs +++ b/Caching/ImageFileCache.WinRT/Properties/AssemblyInfo.cs @@ -7,8 +7,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("© 2015 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("2.7.1")] -[assembly: AssemblyFileVersion("2.7.1")] +[assembly: AssemblyVersion("2.7.2")] +[assembly: AssemblyFileVersion("2.7.2")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/MapControl/Location.cs b/MapControl/Location.cs index 36ac7fdd..ee846bae 100644 --- a/MapControl/Location.cs +++ b/MapControl/Location.cs @@ -39,9 +39,10 @@ namespace MapControl public bool Equals(Location location) { - return location != null + return ReferenceEquals(this, location) + || (location != null && location.latitude == latitude - && location.longitude == longitude; + && location.longitude == longitude); } public override bool Equals(object obj) diff --git a/MapControl/Map.WinRT.cs b/MapControl/Map.WinRT.cs index d3f32043..6d1f1d79 100644 --- a/MapControl/Map.WinRT.cs +++ b/MapControl/Map.WinRT.cs @@ -2,8 +2,6 @@ // © 2015 Clemens Fischer // Licensed under the Microsoft Public License (Ms-PL) -using Windows.Devices.Input; -using Windows.Foundation; using Windows.UI.Xaml; using Windows.UI.Xaml.Input; @@ -17,8 +15,6 @@ namespace MapControl public static readonly DependencyProperty MouseWheelZoomDeltaProperty = DependencyProperty.Register( "MouseWheelZoomDelta", typeof(double), typeof(Map), new PropertyMetadata(1d)); - private Point? mousePosition; - public Map() { ManipulationMode = ManipulationModes.Scale | @@ -26,11 +22,6 @@ namespace MapControl ManipulationDelta += OnManipulationDelta; PointerWheelChanged += OnPointerWheelChanged; - PointerPressed += OnPointerPressed; - PointerReleased += OnPointerReleased; - PointerCanceled += OnPointerReleased; - PointerCaptureLost += OnPointerReleased; - PointerMoved += OnPointerMoved; } /// @@ -49,40 +40,9 @@ namespace MapControl ZoomMap(point.Position, TargetZoomLevel + zoomChange); } - private void OnPointerPressed(object sender, PointerRoutedEventArgs e) - { - if (e.Pointer.PointerDeviceType == PointerDeviceType.Mouse && - CapturePointer(e.Pointer)) - { - mousePosition = e.GetCurrentPoint(this).Position; - } - } - - private void OnPointerReleased(object sender, PointerRoutedEventArgs e) - { - if (e.Pointer.PointerDeviceType == PointerDeviceType.Mouse) - { - mousePosition = null; - ReleasePointerCapture(e.Pointer); - } - } - - private void OnPointerMoved(object sender, PointerRoutedEventArgs e) - { - if (mousePosition.HasValue) - { - var position = e.GetCurrentPoint(this).Position; - TranslateMap(new Point(position.X - mousePosition.Value.X, position.Y - mousePosition.Value.Y)); - mousePosition = position; - } - } - private void OnManipulationDelta(object sender, ManipulationDeltaRoutedEventArgs e) { - if (e.PointerDeviceType == PointerDeviceType.Touch) - { - TransformMap(e.Position, e.Delta.Translation, e.Delta.Rotation, e.Delta.Scale); - } + TransformMap(e.Position, e.Delta.Translation, e.Delta.Rotation, e.Delta.Scale); } } } diff --git a/MapControl/MapBase.cs b/MapControl/MapBase.cs index 818c6ecd..e19144e8 100644 --- a/MapControl/MapBase.cs +++ b/MapControl/MapBase.cs @@ -323,10 +323,8 @@ namespace MapControl /// public void SetTransformOrigin(Point origin) { - ViewportOrigin = new Point( - Math.Min(Math.Max(origin.X, 0d), RenderSize.Width), - Math.Min(Math.Max(origin.Y, 0d), RenderSize.Height)); - transformOrigin = ViewportPointToLocation(ViewportOrigin); + transformOrigin = ViewportPointToLocation(origin); + ViewportOrigin = origin; } /// @@ -388,11 +386,8 @@ namespace MapControl /// public void ZoomMap(Point origin, double zoomLevel) { - if (zoomLevel >= MinZoomLevel && zoomLevel <= MaxZoomLevel) - { - SetTransformOrigin(origin); - TargetZoomLevel = zoomLevel; - } + SetTransformOrigin(origin); + TargetZoomLevel = Math.Min(Math.Max(zoomLevel, MinZoomLevel), MaxZoomLevel); } /// diff --git a/MapControl/Properties/AssemblyInfo.cs b/MapControl/Properties/AssemblyInfo.cs index 0e6f39eb..ba943b26 100644 --- a/MapControl/Properties/AssemblyInfo.cs +++ b/MapControl/Properties/AssemblyInfo.cs @@ -14,8 +14,8 @@ using System.Windows; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("© 2015 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("2.7.1")] -[assembly: AssemblyFileVersion("2.7.1")] +[assembly: AssemblyVersion("2.7.2")] +[assembly: AssemblyFileVersion("2.7.2")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/MapControl/TileGrid.cs b/MapControl/TileGrid.cs index 9368bd1a..54ab6219 100644 --- a/MapControl/TileGrid.cs +++ b/MapControl/TileGrid.cs @@ -25,12 +25,13 @@ namespace MapControl public bool Equals(TileGrid tileGrid) { - return tileGrid != null + return ReferenceEquals(this, tileGrid) + || (tileGrid != null && tileGrid.ZoomLevel == ZoomLevel && tileGrid.XMin == XMin && tileGrid.YMin == YMin && tileGrid.XMax == XMax - && tileGrid.YMax == YMax; + && tileGrid.YMax == YMax); } public override bool Equals(object obj) diff --git a/MapControl/TileImageLoader.WinRT.cs b/MapControl/TileImageLoader.WinRT.cs index 77a6086c..b5a13451 100644 --- a/MapControl/TileImageLoader.WinRT.cs +++ b/MapControl/TileImageLoader.WinRT.cs @@ -9,6 +9,7 @@ using System.Diagnostics; using System.IO; using System.Threading; using System.Threading.Tasks; +using MapControl.Caching; using Windows.Storage; using Windows.Storage.Streams; using Windows.UI.Core; @@ -77,47 +78,54 @@ namespace MapControl { var tileSource = tileLayer.TileSource; var imageTileSource = tileSource as ImageTileSource; - var sourceName = tileLayer.SourceName; - var useCache = Cache != null && !string.IsNullOrEmpty(sourceName); - foreach (var tile in tiles) + if (imageTileSource != null) { - try + foreach (var tile in tiles) { - if (imageTileSource != null) + try { tile.SetImage(imageTileSource.LoadImage(tile.XIndex, tile.Y, tile.ZoomLevel)); } - else + catch (Exception ex) { - var uri = tileSource.GetUri(tile.XIndex, tile.Y, tile.ZoomLevel); - - if (uri == null) - { - tile.SetImage(null); - } - else if (!useCache) - { - tile.SetImage(new BitmapImage(uri)); - } - else - { - pendingTiles.Enqueue(new PendingTile(tile, uri)); - } + Debug.WriteLine(ex.Message); } } - catch (Exception ex) + } + else + { + foreach (var tile in tiles) { - Debug.WriteLine(ex.Message); - } + Uri uri = null; - var newTaskCount = Math.Min(pendingTiles.Count, tileLayer.MaxParallelDownloads) - taskCount; + try + { + uri = tileSource.GetUri(tile.XIndex, tile.Y, tile.ZoomLevel); + } + catch (Exception ex) + { + Debug.WriteLine(ex.Message); + } - while (newTaskCount-- > 0) - { - Interlocked.Increment(ref taskCount); + if (uri == null) + { + tile.SetImage(null); + } + else + { + pendingTiles.Enqueue(new PendingTile(tile, uri)); - Task.Run(async () => await LoadPendingTiles(tileSource, sourceName)); + var newTaskCount = Math.Min(pendingTiles.Count, tileLayer.MaxParallelDownloads) - taskCount; + var sourceName = tileLayer.SourceName; + + while (newTaskCount-- > 0) + { + Interlocked.Increment(ref taskCount); + + Task.Run(async () => await LoadPendingTiles(tileSource, sourceName)); + } + } } } } @@ -132,37 +140,48 @@ namespace MapControl private async Task LoadPendingTiles(TileSource tileSource, string sourceName) { PendingTile pendingTile; + var cache = Cache; - while (pendingTiles.TryDequeue(out pendingTile)) + if (cache == null || sourceName == null) { - var tile = pendingTile.Tile; - var uri = pendingTile.Uri; - var image = pendingTile.Image; - var extension = Path.GetExtension(uri.LocalPath); - - if (string.IsNullOrEmpty(extension) || extension == ".jpeg") + while (pendingTiles.TryDequeue(out pendingTile)) { - extension = ".jpg"; + await DownloadImage(pendingTile.Tile, pendingTile.Image, pendingTile.Uri, null); } - - var cacheKey = string.Format(@"{0}\{1}\{2}\{3}{4}", sourceName, tile.ZoomLevel, tile.XIndex, tile.Y, extension); - var cacheItem = await Cache.GetAsync(cacheKey); - var loaded = false; - - if (cacheItem == null || cacheItem.Expiration <= DateTime.UtcNow) + } + else + { + while (pendingTiles.TryDequeue(out pendingTile)) { - loaded = await DownloadImage(tile, image, uri, cacheKey); - } + var tile = pendingTile.Tile; + var image = pendingTile.Image; + var uri = pendingTile.Uri; + var extension = Path.GetExtension(uri.LocalPath); - if (!loaded && cacheItem != null && cacheItem.Buffer != null) - { - using (var stream = new InMemoryRandomAccessStream()) + if (string.IsNullOrEmpty(extension) || extension == ".jpeg") { - await stream.WriteAsync(cacheItem.Buffer); - await stream.FlushAsync(); - stream.Seek(0); + extension = ".jpg"; + } - await LoadImageFromStream(tile, image, stream); + var cacheKey = string.Format(@"{0}\{1}\{2}\{3}{4}", sourceName, tile.ZoomLevel, tile.XIndex, tile.Y, extension); + var cacheItem = await cache.GetAsync(cacheKey); + var loaded = false; + + if (cacheItem == null || cacheItem.Expiration <= DateTime.UtcNow) + { + loaded = await DownloadImage(tile, image, uri, cacheKey); + } + + if (!loaded && cacheItem != null && cacheItem.Buffer != null) + { + using (var stream = new InMemoryRandomAccessStream()) + { + await stream.WriteAsync(cacheItem.Buffer); + await stream.FlushAsync(); + stream.Seek(0); + + await LoadImageFromStream(tile, image, stream); + } } } } @@ -206,8 +225,9 @@ namespace MapControl stream.Seek(0); var loaded = await LoadImageFromStream(tile, image, stream); + IImageCache cache; - if (loaded && cacheKey != null) + if (loaded && cacheKey != null && (cache = Cache) != null) { var buffer = new Windows.Storage.Streams.Buffer((uint)stream.Size); @@ -226,7 +246,7 @@ namespace MapControl } } - await Cache.SetAsync(cacheKey, buffer, DateTime.UtcNow.Add(expiration)); + await cache.SetAsync(cacheKey, buffer, DateTime.UtcNow.Add(expiration)); } return loaded; diff --git a/MapControl/TileLayer.cs b/MapControl/TileLayer.cs index 0a41ef55..0f64f88f 100644 --- a/MapControl/TileLayer.cs +++ b/MapControl/TileLayer.cs @@ -37,7 +37,8 @@ namespace MapControl { SourceName = "OpenStreetMap", Description = "© [OpenStreetMap Contributors](http://www.openstreetmap.org/copyright)", - TileSource = new TileSource { UriFormat = "http://{c}.tile.openstreetmap.org/{z}/{x}/{y}.png" } + TileSource = new TileSource { UriFormat = "http://{c}.tile.openstreetmap.org/{z}/{x}/{y}.png" }, + MaxZoomLevel = 19 }; } } @@ -75,6 +76,9 @@ namespace MapControl public static readonly DependencyProperty UpdateWhileViewportChangingProperty = DependencyProperty.Register( "UpdateWhileViewportChanging", typeof(bool), typeof(TileLayer), new PropertyMetadata(true)); + public static readonly DependencyProperty LoadTilesDescendingProperty = DependencyProperty.Register( + "LoadTilesDescending", typeof(bool), typeof(TileLayer), new PropertyMetadata(false)); + public static readonly DependencyProperty ForegroundProperty = DependencyProperty.Register( "Foreground", typeof(Brush), typeof(TileLayer), new PropertyMetadata(null)); @@ -198,6 +202,16 @@ namespace MapControl set { SetValue(UpdateWhileViewportChangingProperty, value); } } + /// + /// Controls the order of zoom levels in which map tiles are loaded. + /// The default is value is false, i.e. tiles are loaded in ascending order. + /// + public bool LoadTilesDescending + { + get { return (bool)GetValue(LoadTilesDescendingProperty); } + set { SetValue(LoadTilesDescendingProperty, value); } + } + /// /// Optional foreground brush. Sets MapBase.Foreground, if not null. /// @@ -313,7 +327,14 @@ namespace MapControl Children.Add(tile.Image); } - TileImageLoader.BeginLoadTiles(this, Tiles.Where(t => t.Pending).OrderByDescending(t => t.ZoomLevel)); + var pendingTiles = Tiles.Where(t => t.Pending); + + if (LoadTilesDescending) + { + pendingTiles = pendingTiles.OrderByDescending(t => t.ZoomLevel); // higher zoom levels first + } + + TileImageLoader.BeginLoadTiles(this, pendingTiles); } } diff --git a/MapControl/WinRT/Properties/AssemblyInfo.cs b/MapControl/WinRT/Properties/AssemblyInfo.cs index 751333e4..9350285f 100644 --- a/MapControl/WinRT/Properties/AssemblyInfo.cs +++ b/MapControl/WinRT/Properties/AssemblyInfo.cs @@ -7,8 +7,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("© 2015 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("2.7.1")] -[assembly: AssemblyFileVersion("2.7.1")] +[assembly: AssemblyVersion("2.7.2")] +[assembly: AssemblyFileVersion("2.7.2")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/SampleApps/PhoneApplication/Package.appxmanifest b/SampleApps/PhoneApplication/Package.appxmanifest index 09795d06..146268de 100644 --- a/SampleApps/PhoneApplication/Package.appxmanifest +++ b/SampleApps/PhoneApplication/Package.appxmanifest @@ -1,6 +1,6 @@  - + XAML Map Control Phone Application diff --git a/SampleApps/PhoneApplication/Properties/AssemblyInfo.cs b/SampleApps/PhoneApplication/Properties/AssemblyInfo.cs index 82adfbbb..20cacb82 100644 --- a/SampleApps/PhoneApplication/Properties/AssemblyInfo.cs +++ b/SampleApps/PhoneApplication/Properties/AssemblyInfo.cs @@ -7,8 +7,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("© 2015 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("2.7.1")] -[assembly: AssemblyFileVersion("2.7.1")] +[assembly: AssemblyVersion("2.7.2")] +[assembly: AssemblyFileVersion("2.7.2")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/SampleApps/SilverlightApplication.Web/Properties/AssemblyInfo.cs b/SampleApps/SilverlightApplication.Web/Properties/AssemblyInfo.cs index 4e69e703..a4b1f45e 100644 --- a/SampleApps/SilverlightApplication.Web/Properties/AssemblyInfo.cs +++ b/SampleApps/SilverlightApplication.Web/Properties/AssemblyInfo.cs @@ -7,8 +7,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("© 2015 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("2.7.1")] -[assembly: AssemblyFileVersion("2.7.1")] +[assembly: AssemblyVersion("2.7.2")] +[assembly: AssemblyFileVersion("2.7.2")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/SampleApps/SilverlightApplication.Web/SilverlightApplication.Web.csproj.user b/SampleApps/SilverlightApplication.Web/SilverlightApplication.Web.csproj.user index 9d7fcd03..2509a328 100644 --- a/SampleApps/SilverlightApplication.Web/SilverlightApplication.Web.csproj.user +++ b/SampleApps/SilverlightApplication.Web/SilverlightApplication.Web.csproj.user @@ -4,10 +4,11 @@ - SilverlightApplicationTestPage.aspx - SpecificPage + + + CurrentPage True - True + False False False @@ -18,7 +19,7 @@ - False + True True SilverlightApplication.xap diff --git a/SampleApps/SilverlightApplication/Properties/AssemblyInfo.cs b/SampleApps/SilverlightApplication/Properties/AssemblyInfo.cs index 27fac4fb..8be931ba 100644 --- a/SampleApps/SilverlightApplication/Properties/AssemblyInfo.cs +++ b/SampleApps/SilverlightApplication/Properties/AssemblyInfo.cs @@ -7,8 +7,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("© 2015 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("2.7.1")] -[assembly: AssemblyFileVersion("2.7.1")] +[assembly: AssemblyVersion("2.7.2")] +[assembly: AssemblyFileVersion("2.7.2")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/SampleApps/StoreApplication/Properties/AssemblyInfo.cs b/SampleApps/StoreApplication/Properties/AssemblyInfo.cs index 2e653e23..30191bd7 100644 --- a/SampleApps/StoreApplication/Properties/AssemblyInfo.cs +++ b/SampleApps/StoreApplication/Properties/AssemblyInfo.cs @@ -8,7 +8,7 @@ using System.Runtime.InteropServices; [assembly: AssemblyCopyright("© 2015 Clemens Fischer")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("2.7.1")] -[assembly: AssemblyFileVersion("2.7.1")] +[assembly: AssemblyVersion("2.7.2")] +[assembly: AssemblyFileVersion("2.7.2")] [assembly: AssemblyConfiguration("")] [assembly: ComVisible(false)] diff --git a/SampleApps/UniversalApp/Package.appxmanifest b/SampleApps/UniversalApp/Package.appxmanifest index 141a3b7b..b28221bc 100644 --- a/SampleApps/UniversalApp/Package.appxmanifest +++ b/SampleApps/UniversalApp/Package.appxmanifest @@ -1,6 +1,6 @@  - + UniversalApp diff --git a/SampleApps/UniversalApp/Properties/AssemblyInfo.cs b/SampleApps/UniversalApp/Properties/AssemblyInfo.cs index 6b783c9d..fcac6855 100644 --- a/SampleApps/UniversalApp/Properties/AssemblyInfo.cs +++ b/SampleApps/UniversalApp/Properties/AssemblyInfo.cs @@ -1,14 +1,14 @@ using System.Reflection; using System.Runtime.InteropServices; -[assembly: AssemblyTitle("Windows Universal Sample Application")] -[assembly: AssemblyDescription("XAML Map Control Windows Universal Sample Application")] +[assembly: AssemblyTitle("Universal Windows Sample Application")] +[assembly: AssemblyDescription("XAML Map Control Universal Windows Sample Application")] [assembly: AssemblyProduct("XAML Map Control")] [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("© 2015 Clemens Fischer")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("2.7.1")] -[assembly: AssemblyFileVersion("2.7.1")] +[assembly: AssemblyVersion("2.7.2")] +[assembly: AssemblyFileVersion("2.7.2")] [assembly: AssemblyConfiguration("")] [assembly: ComVisible(false)] diff --git a/SampleApps/UniversalApp/UniversalApp.csproj.user b/SampleApps/UniversalApp/UniversalApp.csproj.user index b3dcca21..1b2f350f 100644 --- a/SampleApps/UniversalApp/UniversalApp.csproj.user +++ b/SampleApps/UniversalApp/UniversalApp.csproj.user @@ -4,4 +4,7 @@ 30F105C9-681E-420b-A277-7C086EAD8A4E true + + Windows + \ No newline at end of file diff --git a/SampleApps/WpfApplication/Properties/AssemblyInfo.cs b/SampleApps/WpfApplication/Properties/AssemblyInfo.cs index 686afc32..2ac8c533 100644 --- a/SampleApps/WpfApplication/Properties/AssemblyInfo.cs +++ b/SampleApps/WpfApplication/Properties/AssemblyInfo.cs @@ -7,8 +7,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("© 2015 Clemens Fischer")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("2.7.1")] -[assembly: AssemblyFileVersion("2.7.1")] +[assembly: AssemblyVersion("2.7.2")] +[assembly: AssemblyFileVersion("2.7.2")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)]