From abfdd89efbe2d7fbbe382166bb798fc5f46cb71b Mon Sep 17 00:00:00 2001 From: ClemensF Date: Sat, 25 May 2013 08:53:50 +0200 Subject: [PATCH] Version 1.3.5. Fixed rendering issue with MapPath (formerly MapShape) and re-arranging of MapPanel child elements when Location is set initially. --- .../FileDbCache/Properties/AssemblyInfo.cs | 4 +- .../ImageFileCache/Properties/AssemblyInfo.cs | 4 +- MapControl/MapControl.Silverlight.csproj | 4 +- MapControl/MapControl.WPF.csproj | 4 +- MapControl/MapImageLayer.cs | 2 +- MapControl/MapPanel.cs | 165 +++++++++--------- ....WinRT.cs => MapPath.Silverlight.WinRT.cs} | 7 +- MapControl/MapPath.WPF.cs | 28 +++ MapControl/{MapShape.cs => MapPath.cs} | 15 +- MapControl/MapPolyline.Silverlight.WinRT.cs | 6 +- MapControl/MapPolyline.WPF.cs | 6 +- MapControl/MapPolyline.cs | 8 +- MapControl/MapRectangle.cs | 16 +- MapControl/MapShape.WPF.cs | 22 --- MapControl/Properties/AssemblyInfo.cs | 4 +- MapControl/WinRT/MapControl.WinRT.csproj | 12 +- MapControl/WinRT/Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../Properties/AssemblyInfo.cs | 4 +- .../WpfApplication/Properties/AssemblyInfo.cs | 4 +- 22 files changed, 168 insertions(+), 163 deletions(-) rename MapControl/{MapShape.Silverlight.WinRT.cs => MapPath.Silverlight.WinRT.cs} (66%) create mode 100644 MapControl/MapPath.WPF.cs rename MapControl/{MapShape.cs => MapPath.cs} (68%) delete mode 100644 MapControl/MapShape.WPF.cs diff --git a/Caching/FileDbCache/Properties/AssemblyInfo.cs b/Caching/FileDbCache/Properties/AssemblyInfo.cs index 23b49163..32c8fa11 100644 --- a/Caching/FileDbCache/Properties/AssemblyInfo.cs +++ b/Caching/FileDbCache/Properties/AssemblyInfo.cs @@ -8,8 +8,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © Clemens Fischer 2012-2013")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("1.3.4")] -[assembly: AssemblyFileVersion("1.3.4")] +[assembly: AssemblyVersion("1.3.5")] +[assembly: AssemblyFileVersion("1.3.5")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/Caching/ImageFileCache/Properties/AssemblyInfo.cs b/Caching/ImageFileCache/Properties/AssemblyInfo.cs index e7d1928a..0a947e8c 100644 --- a/Caching/ImageFileCache/Properties/AssemblyInfo.cs +++ b/Caching/ImageFileCache/Properties/AssemblyInfo.cs @@ -8,8 +8,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © Clemens Fischer 2012-2013")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("1.3.4")] -[assembly: AssemblyFileVersion("1.3.4")] +[assembly: AssemblyVersion("1.3.5")] +[assembly: AssemblyFileVersion("1.3.5")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/MapControl/MapControl.Silverlight.csproj b/MapControl/MapControl.Silverlight.csproj index 0183574d..866f943a 100644 --- a/MapControl/MapControl.Silverlight.csproj +++ b/MapControl/MapControl.Silverlight.csproj @@ -80,11 +80,11 @@ + - - + diff --git a/MapControl/MapControl.WPF.csproj b/MapControl/MapControl.WPF.csproj index 915e7c57..7b9844b7 100644 --- a/MapControl/MapControl.WPF.csproj +++ b/MapControl/MapControl.WPF.csproj @@ -65,8 +65,8 @@ - - + + diff --git a/MapControl/MapImageLayer.cs b/MapControl/MapImageLayer.cs index 46e77f8f..67cefa5a 100644 --- a/MapControl/MapImageLayer.cs +++ b/MapControl/MapImageLayer.cs @@ -203,7 +203,7 @@ namespace MapControl currentImageIndex = (currentImageIndex + 1) % 2; mapImage = (MapImage)Children[currentImageIndex]; mapImage.Source = null; - mapImage.North = double.NaN; // avoid frequent MapRectangle.UpdateGeometry() calls + mapImage.North = double.NaN; // avoid frequent MapRectangle.UpdateData() calls mapImage.West = west; mapImage.East = east; mapImage.South = south; diff --git a/MapControl/MapPanel.cs b/MapControl/MapPanel.cs index a7e8dd38..f83bbf65 100644 --- a/MapControl/MapPanel.cs +++ b/MapControl/MapPanel.cs @@ -2,7 +2,6 @@ // Copyright © Clemens Fischer 2012-2013 // Licensed under the Microsoft Public License (Ms-PL) -using System; #if NETFX_CORE using Windows.Foundation; using Windows.UI.Xaml; @@ -98,28 +97,14 @@ namespace MapControl { foreach (UIElement element in InternalChildren) { - var rect = new Rect(0d, 0d, element.DesiredSize.Width, element.DesiredSize.Height); var location = GetLocation(element); - if (element is FrameworkElement) - { - if (location != null) - { - AlignElementWithLocation((FrameworkElement)element, ref rect); - } - else - { - AlignElementWithoutLocation((FrameworkElement)element, finalSize, ref rect); - } - } - - element.Arrange(rect); + ArrangeElement(element, finalSize, location != null); if (location != null) { SetViewportPosition(element, parentMap, location); } - } return finalSize; @@ -143,8 +128,14 @@ namespace MapControl { var mapElement = element as IMapElement; var parentMap = mapElement != null ? mapElement.ParentMap : GetParentMap(element); + var location = e.NewValue as Location; - SetViewportPosition(element, parentMap, (Location)e.NewValue); + if ((location != null) != (e.OldValue != null)) + { + ArrangeElement(element, null, location != null); + } + + SetViewportPosition(element, parentMap, location); } } @@ -193,74 +184,90 @@ namespace MapControl translateTransform.Y = viewportPosition.Y; } - private static void AlignElementWithLocation(FrameworkElement element, ref Rect arrangeRect) + private static void ArrangeElement(UIElement element, Size? panelSize, bool hasLocation) { - switch (element.HorizontalAlignment) + var rect = new Rect(0d, 0d, element.DesiredSize.Width, element.DesiredSize.Height); + var frameworkElement = element as FrameworkElement; + + if (frameworkElement != null) { - case HorizontalAlignment.Center: - arrangeRect.X = -arrangeRect.Width / 2d; - break; + if (hasLocation) + { + switch (frameworkElement.HorizontalAlignment) + { + case HorizontalAlignment.Center: + rect.X = -rect.Width / 2d; + break; - case HorizontalAlignment.Right: - arrangeRect.X = -arrangeRect.Width; - break; + case HorizontalAlignment.Right: + rect.X = -rect.Width; + break; - default: - break; + default: + break; + } + + switch (frameworkElement.VerticalAlignment) + { + case VerticalAlignment.Center: + rect.Y = -rect.Height / 2d; + break; + + case VerticalAlignment.Bottom: + rect.Y = -rect.Height; + break; + + default: + break; + } + } + else + { + if (!panelSize.HasValue) + { + var panel = frameworkElement.Parent as Panel; + panelSize = panel != null ? panel.RenderSize : Size.Empty; + } + + switch (frameworkElement.HorizontalAlignment) + { + case HorizontalAlignment.Center: + rect.X = (panelSize.Value.Width - rect.Width) / 2d; + break; + + case HorizontalAlignment.Right: + rect.X = panelSize.Value.Width - rect.Width; + break; + + case HorizontalAlignment.Stretch: + rect.Width = panelSize.Value.Width; + break; + + default: + break; + } + + switch (frameworkElement.VerticalAlignment) + { + case VerticalAlignment.Center: + rect.Y = (panelSize.Value.Height - rect.Height) / 2d; + break; + + case VerticalAlignment.Bottom: + rect.Y = panelSize.Value.Height - rect.Height; + break; + + case VerticalAlignment.Stretch: + rect.Height = panelSize.Value.Height; + break; + + default: + break; + } + } } - switch (element.VerticalAlignment) - { - case VerticalAlignment.Center: - arrangeRect.Y = -arrangeRect.Height / 2d; - break; - - case VerticalAlignment.Bottom: - arrangeRect.Y = -arrangeRect.Height; - break; - - default: - break; - } - } - - private static void AlignElementWithoutLocation(FrameworkElement element, Size panelSize, ref Rect arrangeRect) - { - switch (element.HorizontalAlignment) - { - case HorizontalAlignment.Center: - arrangeRect.X = (panelSize.Width - arrangeRect.Width) / 2d; - break; - - case HorizontalAlignment.Right: - arrangeRect.X = panelSize.Width - arrangeRect.Width; - break; - - case HorizontalAlignment.Stretch: - arrangeRect.Width = panelSize.Width; - break; - - default: - break; - } - - switch (element.VerticalAlignment) - { - case VerticalAlignment.Center: - arrangeRect.Y = (panelSize.Height - arrangeRect.Height) / 2d; - break; - - case VerticalAlignment.Bottom: - arrangeRect.Y = panelSize.Height - arrangeRect.Height; - break; - - case VerticalAlignment.Stretch: - arrangeRect.Height = panelSize.Height; - break; - - default: - break; - } + element.Arrange(rect); } } } diff --git a/MapControl/MapShape.Silverlight.WinRT.cs b/MapControl/MapPath.Silverlight.WinRT.cs similarity index 66% rename from MapControl/MapShape.Silverlight.WinRT.cs rename to MapControl/MapPath.Silverlight.WinRT.cs index 870b8248..118947d6 100644 --- a/MapControl/MapShape.Silverlight.WinRT.cs +++ b/MapControl/MapPath.Silverlight.WinRT.cs @@ -3,20 +3,17 @@ // Licensed under the Microsoft Public License (Ms-PL) #if NETFX_CORE -using Windows.UI.Xaml.Media; using Windows.UI.Xaml.Shapes; #else -using System.Windows.Media; using System.Windows.Shapes; #endif namespace MapControl { - public partial class MapShape : Path + public partial class MapPath : Path { - public MapShape(Geometry geometry) + public MapPath() { - Data = Geometry = geometry; MapPanel.AddParentMapHandlers(this); } } diff --git a/MapControl/MapPath.WPF.cs b/MapControl/MapPath.WPF.cs new file mode 100644 index 00000000..f761fc41 --- /dev/null +++ b/MapControl/MapPath.WPF.cs @@ -0,0 +1,28 @@ +// XAML Map Control - http://xamlmapcontrol.codeplex.com/ +// Copyright © Clemens Fischer 2012-2013 +// Licensed under the Microsoft Public License (Ms-PL) + +using System.Windows; +using System.Windows.Media; +using System.Windows.Shapes; + +namespace MapControl +{ + public partial class MapPath : Shape + { + public static readonly DependencyProperty DataProperty = DependencyProperty.Register( + "Data", typeof(Geometry), typeof(MapPath), + new FrameworkPropertyMetadata(null, FrameworkPropertyMetadataOptions.AffectsRender)); + + public Geometry Data + { + get { return (Geometry)GetValue(DataProperty); } + set { SetValue(DataProperty, value); } + } + + protected override Geometry DefiningGeometry + { + get { return Data; } + } + } +} diff --git a/MapControl/MapShape.cs b/MapControl/MapPath.cs similarity index 68% rename from MapControl/MapShape.cs rename to MapControl/MapPath.cs index 35e91cf4..0f263379 100644 --- a/MapControl/MapShape.cs +++ b/MapControl/MapPath.cs @@ -4,11 +4,8 @@ #if NETFX_CORE using Windows.Foundation; -using Windows.UI.Xaml.Media; -using Windows.UI.Xaml.Shapes; #else using System.Windows; -using System.Windows.Media; #endif namespace MapControl @@ -16,7 +13,7 @@ namespace MapControl /// /// Base class for map shapes. /// - public partial class MapShape : IMapElement + public partial class MapPath : IMapElement { private MapBase parentMap; @@ -26,20 +23,18 @@ namespace MapControl set { parentMap = value; - UpdateGeometry(); + UpdateData(); } } - protected readonly Geometry Geometry; - - protected virtual void UpdateGeometry() + protected virtual void UpdateData() { } protected override Size MeasureOverride(Size constraint) { - // Shape.MeasureOverride in WPF and WinRT sometimes return a Size with zero - // width or height, whereas Shape.MeasureOverride in Silverlight occasionally + // base.MeasureOverride in WPF and WinRT sometimes return a Size with zero + // width or height, whereas base.MeasureOverride in Silverlight occasionally // throws an ArgumentException, as it tries to create a Size from a negative // width or height, apparently resulting from a transformed Geometry. // In either case it seems to be sufficient to simply return a non-zero size. diff --git a/MapControl/MapPolyline.Silverlight.WinRT.cs b/MapControl/MapPolyline.Silverlight.WinRT.cs index b00a0feb..c4143591 100644 --- a/MapControl/MapPolyline.Silverlight.WinRT.cs +++ b/MapControl/MapPolyline.Silverlight.WinRT.cs @@ -15,13 +15,13 @@ namespace MapControl public partial class MapPolyline { public MapPolyline() - : base(new PathGeometry()) { + Data = new PathGeometry(); } - protected override void UpdateGeometry() + protected override void UpdateData() { - var geometry = (PathGeometry)Geometry; + var geometry = (PathGeometry)Data; var locations = Locations; Location first; diff --git a/MapControl/MapPolyline.WPF.cs b/MapControl/MapPolyline.WPF.cs index a6aae403..cb3a13e2 100644 --- a/MapControl/MapPolyline.WPF.cs +++ b/MapControl/MapPolyline.WPF.cs @@ -10,13 +10,13 @@ namespace MapControl public partial class MapPolyline { public MapPolyline() - : base(new StreamGeometry()) { + Data = new StreamGeometry(); } - protected override void UpdateGeometry() + protected override void UpdateData() { - var geometry = (StreamGeometry)Geometry; + var geometry = (StreamGeometry)Data; var locations = Locations; Location first; diff --git a/MapControl/MapPolyline.cs b/MapControl/MapPolyline.cs index 5ab1a6a9..500937cc 100644 --- a/MapControl/MapPolyline.cs +++ b/MapControl/MapPolyline.cs @@ -14,7 +14,7 @@ using System.Windows; namespace MapControl { - public partial class MapPolyline : MapShape + public partial class MapPolyline : MapPath { #if NETFX_CORE // For WinRT, the Locations dependency property type is declared as object @@ -29,7 +29,7 @@ namespace MapControl public static readonly DependencyProperty IsClosedProperty = DependencyProperty.Register( "IsClosed", typeof(bool), typeof(MapPolyline), - new PropertyMetadata(false, (o, e) => ((MapPolyline)o).UpdateGeometry())); + new PropertyMetadata(false, (o, e) => ((MapPolyline)o).UpdateData())); /// /// Gets or sets the locations that define the polyline points. @@ -51,7 +51,7 @@ namespace MapControl private void LocationCollectionChanged(object sender, NotifyCollectionChangedEventArgs e) { - UpdateGeometry(); + UpdateData(); } private static void LocationsPropertyChanged(DependencyObject obj, DependencyPropertyChangedEventArgs e) @@ -70,7 +70,7 @@ namespace MapControl newCollection.CollectionChanged += mapPolyline.LocationCollectionChanged; } - mapPolyline.UpdateGeometry(); + mapPolyline.UpdateData(); } } } diff --git a/MapControl/MapRectangle.cs b/MapControl/MapRectangle.cs index f161024d..5e3499ee 100644 --- a/MapControl/MapRectangle.cs +++ b/MapControl/MapRectangle.cs @@ -16,27 +16,27 @@ namespace MapControl /// /// Fills a rectangular area defined by South, North, West and East with a Brush. /// - public class MapRectangle : MapShape + public class MapRectangle : MapPath { public static readonly DependencyProperty SouthProperty = DependencyProperty.Register( "South", typeof(double), typeof(MapRectangle), - new PropertyMetadata(double.NaN, (o, e) => ((MapRectangle)o).UpdateGeometry())); + new PropertyMetadata(double.NaN, (o, e) => ((MapRectangle)o).UpdateData())); public static readonly DependencyProperty NorthProperty = DependencyProperty.Register( "North", typeof(double), typeof(MapRectangle), - new PropertyMetadata(double.NaN, (o, e) => ((MapRectangle)o).UpdateGeometry())); + new PropertyMetadata(double.NaN, (o, e) => ((MapRectangle)o).UpdateData())); public static readonly DependencyProperty WestProperty = DependencyProperty.Register( "West", typeof(double), typeof(MapRectangle), - new PropertyMetadata(double.NaN, (o, e) => ((MapRectangle)o).UpdateGeometry())); + new PropertyMetadata(double.NaN, (o, e) => ((MapRectangle)o).UpdateData())); public static readonly DependencyProperty EastProperty = DependencyProperty.Register( "East", typeof(double), typeof(MapRectangle), - new PropertyMetadata(double.NaN, (o, e) => ((MapRectangle)o).UpdateGeometry())); + new PropertyMetadata(double.NaN, (o, e) => ((MapRectangle)o).UpdateData())); public MapRectangle() - : base(new RectangleGeometry()) { + Data = new RectangleGeometry(); } public double South @@ -63,9 +63,9 @@ namespace MapControl set { SetValue(EastProperty, value); } } - protected override void UpdateGeometry() + protected override void UpdateData() { - var geometry = (RectangleGeometry)Geometry; + var geometry = (RectangleGeometry)Data; if (ParentMap != null && !double.IsNaN(South) && !double.IsNaN(North) && diff --git a/MapControl/MapShape.WPF.cs b/MapControl/MapShape.WPF.cs deleted file mode 100644 index 6d944287..00000000 --- a/MapControl/MapShape.WPF.cs +++ /dev/null @@ -1,22 +0,0 @@ -// XAML Map Control - http://xamlmapcontrol.codeplex.com/ -// Copyright © Clemens Fischer 2012-2013 -// Licensed under the Microsoft Public License (Ms-PL) - -using System.Windows.Media; -using System.Windows.Shapes; - -namespace MapControl -{ - public partial class MapShape : Shape - { - public MapShape(Geometry geometry) - { - Geometry = geometry; - } - - protected override Geometry DefiningGeometry - { - get { return Geometry; } - } - } -} diff --git a/MapControl/Properties/AssemblyInfo.cs b/MapControl/Properties/AssemblyInfo.cs index 7c26a4ab..b0b16132 100644 --- a/MapControl/Properties/AssemblyInfo.cs +++ b/MapControl/Properties/AssemblyInfo.cs @@ -15,8 +15,8 @@ using System.Windows; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © Clemens Fischer 2012-2013")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("1.3.4")] -[assembly: AssemblyFileVersion("1.3.4")] +[assembly: AssemblyVersion("1.3.5")] +[assembly: AssemblyFileVersion("1.3.5")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/MapControl/WinRT/MapControl.WinRT.csproj b/MapControl/WinRT/MapControl.WinRT.csproj index 1d801d08..c24260b6 100644 --- a/MapControl/WinRT/MapControl.WinRT.csproj +++ b/MapControl/WinRT/MapControl.WinRT.csproj @@ -78,6 +78,12 @@ MapPanel.Silverlight.WinRT.cs + + MapPath.cs + + + MapPath.Silverlight.WinRT.cs + MapPolyline.cs @@ -87,12 +93,6 @@ MapRectangle.cs - - MapShape.cs - - - MapShape.Silverlight.WinRT.cs - MapTransform.cs diff --git a/MapControl/WinRT/Properties/AssemblyInfo.cs b/MapControl/WinRT/Properties/AssemblyInfo.cs index f9725955..9ce4a501 100644 --- a/MapControl/WinRT/Properties/AssemblyInfo.cs +++ b/MapControl/WinRT/Properties/AssemblyInfo.cs @@ -8,8 +8,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © Clemens Fischer 2012-2013")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("1.3.4")] -[assembly: AssemblyFileVersion("1.3.4")] +[assembly: AssemblyVersion("1.3.5")] +[assembly: AssemblyFileVersion("1.3.5")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/SampleApps/SilverlightApplication.Web/Properties/AssemblyInfo.cs b/SampleApps/SilverlightApplication.Web/Properties/AssemblyInfo.cs index 7bb5af60..230e140d 100644 --- a/SampleApps/SilverlightApplication.Web/Properties/AssemblyInfo.cs +++ b/SampleApps/SilverlightApplication.Web/Properties/AssemblyInfo.cs @@ -8,8 +8,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © Clemens Fischer 2012-2013")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("1.3.4")] -[assembly: AssemblyFileVersion("1.3.4")] +[assembly: AssemblyVersion("1.3.5")] +[assembly: AssemblyFileVersion("1.3.5")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/SampleApps/SilverlightApplication/Properties/AssemblyInfo.cs b/SampleApps/SilverlightApplication/Properties/AssemblyInfo.cs index 9ff230cd..cfa9dfaf 100644 --- a/SampleApps/SilverlightApplication/Properties/AssemblyInfo.cs +++ b/SampleApps/SilverlightApplication/Properties/AssemblyInfo.cs @@ -8,8 +8,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © Clemens Fischer 2012-2013")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("1.3.4")] -[assembly: AssemblyFileVersion("1.3.4")] +[assembly: AssemblyVersion("1.3.5")] +[assembly: AssemblyFileVersion("1.3.5")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/SampleApps/StoreApplication/Properties/AssemblyInfo.cs b/SampleApps/StoreApplication/Properties/AssemblyInfo.cs index ea8194ad..a2ee4f91 100644 --- a/SampleApps/StoreApplication/Properties/AssemblyInfo.cs +++ b/SampleApps/StoreApplication/Properties/AssemblyInfo.cs @@ -8,8 +8,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © Clemens Fischer 2012-2013")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("1.3.4")] -[assembly: AssemblyFileVersion("1.3.4")] +[assembly: AssemblyVersion("1.3.5")] +[assembly: AssemblyFileVersion("1.3.5")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/SampleApps/SurfaceApplication/Properties/AssemblyInfo.cs b/SampleApps/SurfaceApplication/Properties/AssemblyInfo.cs index 598705a4..d92ba43b 100644 --- a/SampleApps/SurfaceApplication/Properties/AssemblyInfo.cs +++ b/SampleApps/SurfaceApplication/Properties/AssemblyInfo.cs @@ -8,8 +8,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © Clemens Fischer 2012-2013")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("1.3.4")] -[assembly: AssemblyFileVersion("1.3.4")] +[assembly: AssemblyVersion("1.3.5")] +[assembly: AssemblyFileVersion("1.3.5")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)] diff --git a/SampleApps/WpfApplication/Properties/AssemblyInfo.cs b/SampleApps/WpfApplication/Properties/AssemblyInfo.cs index 23180d89..a6d2aa7b 100644 --- a/SampleApps/WpfApplication/Properties/AssemblyInfo.cs +++ b/SampleApps/WpfApplication/Properties/AssemblyInfo.cs @@ -8,8 +8,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyCompany("Clemens Fischer")] [assembly: AssemblyCopyright("Copyright © Clemens Fischer 2012-2013")] [assembly: AssemblyTrademark("")] -[assembly: AssemblyVersion("1.3.4")] -[assembly: AssemblyFileVersion("1.3.4")] +[assembly: AssemblyVersion("1.3.5")] +[assembly: AssemblyFileVersion("1.3.5")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCulture("")] [assembly: ComVisible(false)]