Index: Core/Components/src/Core.Components.BruTile.IO/AsyncTileFetcher.cs
===================================================================
diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -r2c5e077a0f546af6d6379eb93111fd8366fc2224
--- Core/Components/src/Core.Components.BruTile.IO/AsyncTileFetcher.cs	(.../AsyncTileFetcher.cs)	(revision 67284323e2785c651633d9c52049ba12a9c70e6a)
+++ Core/Components/src/Core.Components.BruTile.IO/AsyncTileFetcher.cs	(.../AsyncTileFetcher.cs)	(revision 2c5e077a0f546af6d6379eb93111fd8366fc2224)
@@ -145,7 +145,7 @@
             GC.SuppressFinalize(this);
         }
 
-        protected virtual void Dispose(bool disposing)
+        private void Dispose(bool disposing)
         {
             if (IsDisposed)
             {
Index: Core/Components/src/Core.Components.BruTile/Configurations/PersistentCacheConfiguration.cs
===================================================================
diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -r2c5e077a0f546af6d6379eb93111fd8366fc2224
--- Core/Components/src/Core.Components.BruTile/Configurations/PersistentCacheConfiguration.cs	(.../PersistentCacheConfiguration.cs)	(revision 67284323e2785c651633d9c52049ba12a9c70e6a)
+++ Core/Components/src/Core.Components.BruTile/Configurations/PersistentCacheConfiguration.cs	(.../PersistentCacheConfiguration.cs)	(revision 2c5e077a0f546af6d6379eb93111fd8366fc2224)
@@ -114,7 +114,7 @@
         /// doesn't allow for tiles to be received.</exception>
         protected abstract void OnInitialize();
 
-        protected virtual void Dispose(bool disposing)
+        private void Dispose(bool disposing)
         {
             if (IsDisposed)
             {
Index: Core/Components/src/Core.Components.Chart/Data/ChartDataCollection.cs
===================================================================
diff -u -r4a60f6ca9a08736cfaf0fac6e6f2e89e9fa59aae -r2c5e077a0f546af6d6379eb93111fd8366fc2224
--- Core/Components/src/Core.Components.Chart/Data/ChartDataCollection.cs	(.../ChartDataCollection.cs)	(revision 4a60f6ca9a08736cfaf0fac6e6f2e89e9fa59aae)
+++ Core/Components/src/Core.Components.Chart/Data/ChartDataCollection.cs	(.../ChartDataCollection.cs)	(revision 2c5e077a0f546af6d6379eb93111fd8366fc2224)
@@ -43,6 +43,14 @@
             chartDataList = new List<ChartData>();
         }
 
+        public override bool HasData
+        {
+            get
+            {
+                return chartDataList.Any(c => c.HasData);
+            }
+        }
+
         /// <summary>
         /// Gets the collection of <see cref="ChartData"/> of the <see cref="ChartDataCollection"/>.
         /// </summary>
@@ -100,13 +108,5 @@
         {
             chartDataList.Clear();
         }
-
-        public override bool HasData
-        {
-            get
-            {
-                return chartDataList.Any(c => c.HasData);
-            }
-        }
     }
 }
\ No newline at end of file
Index: Core/Components/src/Core.Components.Chart/Data/PointBasedChartData.cs
===================================================================
diff -u -r4a60f6ca9a08736cfaf0fac6e6f2e89e9fa59aae -r2c5e077a0f546af6d6379eb93111fd8366fc2224
--- Core/Components/src/Core.Components.Chart/Data/PointBasedChartData.cs	(.../PointBasedChartData.cs)	(revision 4a60f6ca9a08736cfaf0fac6e6f2e89e9fa59aae)
+++ Core/Components/src/Core.Components.Chart/Data/PointBasedChartData.cs	(.../PointBasedChartData.cs)	(revision 2c5e077a0f546af6d6379eb93111fd8366fc2224)
@@ -43,6 +43,14 @@
             points = new Point2D[0];
         }
 
+        public override bool HasData
+        {
+            get
+            {
+                return Points.Any();
+            }
+        }
+
         /// <summary>
         /// Gets or sets an array of points in 2D space.
         /// </summary>
@@ -63,13 +71,5 @@
                 points = value;
             }
         }
-
-        public override bool HasData
-        {
-            get
-            {
-                return Points.Any();
-            }
-        }
     }
 }
\ No newline at end of file
Index: Core/Components/src/Core.Components.DotSpatial.Forms/BackgroundLayerStatus.cs
===================================================================
diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -r2c5e077a0f546af6d6379eb93111fd8366fc2224
--- Core/Components/src/Core.Components.DotSpatial.Forms/BackgroundLayerStatus.cs	(.../BackgroundLayerStatus.cs)	(revision 67284323e2785c651633d9c52049ba12a9c70e6a)
+++ Core/Components/src/Core.Components.DotSpatial.Forms/BackgroundLayerStatus.cs	(.../BackgroundLayerStatus.cs)	(revision 2c5e077a0f546af6d6379eb93111fd8366fc2224)
@@ -103,7 +103,7 @@
             GC.SuppressFinalize(this);
         }
 
-        protected virtual void Dispose(bool disposing)
+        private void Dispose(bool disposing)
         {
             if (disposing)
             {
Index: Core/Components/src/Core.Components.DotSpatial.Forms/MapControl.cs
===================================================================
diff -u -r357925a9ba2aebce58a9e03e620c6d470323672f -r2c5e077a0f546af6d6379eb93111fd8366fc2224
--- Core/Components/src/Core.Components.DotSpatial.Forms/MapControl.cs	(.../MapControl.cs)	(revision 357925a9ba2aebce58a9e03e620c6d470323672f)
+++ Core/Components/src/Core.Components.DotSpatial.Forms/MapControl.cs	(.../MapControl.cs)	(revision 2c5e077a0f546af6d6379eb93111fd8366fc2224)
@@ -119,7 +119,7 @@
             }
         }
 
-        public virtual void RemoveAllData()
+        public void RemoveAllData()
         {
             removing = true;
             Data = null;
Index: Core/Components/src/Core.Components.DotSpatial/Converter/MapDataHelper.cs
===================================================================
diff -u -r6237af4606598e43ebf0b3815a12677277c6eda0 -r2c5e077a0f546af6d6379eb93111fd8366fc2224
--- Core/Components/src/Core.Components.DotSpatial/Converter/MapDataHelper.cs	(.../MapDataHelper.cs)	(revision 6237af4606598e43ebf0b3815a12677277c6eda0)
+++ Core/Components/src/Core.Components.DotSpatial/Converter/MapDataHelper.cs	(.../MapDataHelper.cs)	(revision 2c5e077a0f546af6d6379eb93111fd8366fc2224)
@@ -19,7 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
 using System.ComponentModel;
 using System.Drawing.Drawing2D;
 using Core.Components.Gis.Data;
Index: Core/Components/src/Core.Components.DotSpatial/Projections/ReprojectExtensions.cs
===================================================================
diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -r2c5e077a0f546af6d6379eb93111fd8366fc2224
--- Core/Components/src/Core.Components.DotSpatial/Projections/ReprojectExtensions.cs	(.../ReprojectExtensions.cs)	(revision 67284323e2785c651633d9c52049ba12a9c70e6a)
+++ Core/Components/src/Core.Components.DotSpatial/Projections/ReprojectExtensions.cs	(.../ReprojectExtensions.cs)	(revision 2c5e077a0f546af6d6379eb93111fd8366fc2224)
@@ -66,7 +66,7 @@
             }
             if (ring.Coordinates.Count < 3)
             {
-                throw new ArgumentException("Ring must contain at least 3 coordinates.",
+                throw new ArgumentException(@"Ring must contain at least 3 coordinates.",
                                             nameof(ring));
             }
 
@@ -154,8 +154,10 @@
         private static IList<Coordinate> GetDensifiedCoordinates(IList<Coordinate> original, int numberOfAdditionalPoints)
         {
             int numberOfEdges = original.Count - 1;
-            var resultList = new List<Coordinate>(numberOfEdges * (numberOfAdditionalPoints + 1) + 1);
-            resultList.Add(original[0]);
+            var resultList = new List<Coordinate>(numberOfEdges * (numberOfAdditionalPoints + 1) + 1)
+            {
+                original[0]
+            };
             for (var i = 1; i <= numberOfEdges; i++)
             {
                 resultList.AddRange(GetEdgePointsExcludingStart(original[i - 1], original[i], numberOfAdditionalPoints));
@@ -168,7 +170,7 @@
             if (numberOfAdditionalPoints < 0)
             {
                 throw new ArgumentOutOfRangeException(nameof(numberOfAdditionalPoints),
-                                                      "Number of additional points cannot be negative.");
+                                                      @"Number of additional points cannot be negative.");
             }
 
             double dx = (end.X - start.X) / (numberOfAdditionalPoints + 1);
Index: Core/Components/src/Core.Components.DotSpatial/RdNewMouseCoordinatesMapExtension.cs
===================================================================
diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -r2c5e077a0f546af6d6379eb93111fd8366fc2224
--- Core/Components/src/Core.Components.DotSpatial/RdNewMouseCoordinatesMapExtension.cs	(.../RdNewMouseCoordinatesMapExtension.cs)	(revision 67284323e2785c651633d9c52049ba12a9c70e6a)
+++ Core/Components/src/Core.Components.DotSpatial/RdNewMouseCoordinatesMapExtension.cs	(.../RdNewMouseCoordinatesMapExtension.cs)	(revision 2c5e077a0f546af6d6379eb93111fd8366fc2224)
@@ -72,7 +72,8 @@
                 Height = 16,
                 Controls =
                 {
-                    xLabel, yLabel
+                    xLabel,
+                    yLabel
                 },
                 RowCount = 1,
                 ColumnCount = 2
Index: Core/Components/src/Core.Components.Gis.IO/Readers/WmtsConnectionInfoReader.cs
===================================================================
diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -r2c5e077a0f546af6d6379eb93111fd8366fc2224
--- Core/Components/src/Core.Components.Gis.IO/Readers/WmtsConnectionInfoReader.cs	(.../WmtsConnectionInfoReader.cs)	(revision 67284323e2785c651633d9c52049ba12a9c70e6a)
+++ Core/Components/src/Core.Components.Gis.IO/Readers/WmtsConnectionInfoReader.cs	(.../WmtsConnectionInfoReader.cs)	(revision 2c5e077a0f546af6d6379eb93111fd8366fc2224)
@@ -186,7 +186,7 @@
             XElement nameElement = element.Element(WmtsConnectionInfoXmlDefinitions.WmtsConnectionNameElement);
             XElement urlElement = element.Element(WmtsConnectionInfoXmlDefinitions.WmtsConnectionUrlElement);
 
-            return new WmtsConnectionInfo(nameElement.Value, urlElement.Value);
+            return new WmtsConnectionInfo(nameElement?.Value, urlElement?.Value);
         }
     }
 }
\ No newline at end of file
Index: Core/Components/src/Core.Components.Gis/Data/Removable/IRemovable.cs
===================================================================
diff -u -r4805eca43ab208881bafc117386bd7364333a8ba -r2c5e077a0f546af6d6379eb93111fd8366fc2224
--- Core/Components/src/Core.Components.Gis/Data/Removable/IRemovable.cs	(.../IRemovable.cs)	(revision 4805eca43ab208881bafc117386bd7364333a8ba)
+++ Core/Components/src/Core.Components.Gis/Data/Removable/IRemovable.cs	(.../IRemovable.cs)	(revision 2c5e077a0f546af6d6379eb93111fd8366fc2224)
@@ -24,8 +24,5 @@
     /// <summary>
     /// Marks a <see cref="FeatureBasedMapData"/> as removable from its collection.
     /// </summary>
-    public interface IRemovable
-    {
-        
-    }
+    public interface IRemovable {}
 }
\ No newline at end of file
Index: Core/Components/src/Core.Components.Gis/Data/WmtsMapData.cs
===================================================================
diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -r2c5e077a0f546af6d6379eb93111fd8366fc2224
--- Core/Components/src/Core.Components.Gis/Data/WmtsMapData.cs	(.../WmtsMapData.cs)	(revision 67284323e2785c651633d9c52049ba12a9c70e6a)
+++ Core/Components/src/Core.Components.Gis/Data/WmtsMapData.cs	(.../WmtsMapData.cs)	(revision 2c5e077a0f546af6d6379eb93111fd8366fc2224)
@@ -103,7 +103,7 @@
             }
             if (!preferredFormat.StartsWith("image/"))
             {
-                throw new ArgumentException("Specified image format is not a MIME type.", nameof(preferredFormat));
+                throw new ArgumentException(@"Specified image format is not a MIME type.", nameof(preferredFormat));
             }
 
             SourceCapabilitiesUrl = sourceCapabilitiesUrl;
Index: Core/Components/src/Core.Components.Gis/Features/MapFeature.cs
===================================================================
diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -r2c5e077a0f546af6d6379eb93111fd8366fc2224
--- Core/Components/src/Core.Components.Gis/Features/MapFeature.cs	(.../MapFeature.cs)	(revision 67284323e2785c651633d9c52049ba12a9c70e6a)
+++ Core/Components/src/Core.Components.Gis/Features/MapFeature.cs	(.../MapFeature.cs)	(revision 2c5e077a0f546af6d6379eb93111fd8366fc2224)
@@ -51,11 +51,11 @@
         /// <summary>
         /// Gets the geometries defined in the RD-new coordinate system associated with this feature.
         /// </summary>
-        public IEnumerable<MapGeometry> MapGeometries { get; private set; }
+        public IEnumerable<MapGeometry> MapGeometries { get; }
 
         /// <summary>
         /// Gets the meta data associated with the feature.
         /// </summary>
-        public IDictionary<string, object> MetaData { get; private set; }
+        public IDictionary<string, object> MetaData { get; }
     }
 }
\ No newline at end of file
Index: Core/Components/src/Core.Components.Gis/Geometries/MapGeometry.cs
===================================================================
diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -r2c5e077a0f546af6d6379eb93111fd8366fc2224
--- Core/Components/src/Core.Components.Gis/Geometries/MapGeometry.cs	(.../MapGeometry.cs)	(revision 67284323e2785c651633d9c52049ba12a9c70e6a)
+++ Core/Components/src/Core.Components.Gis/Geometries/MapGeometry.cs	(.../MapGeometry.cs)	(revision 2c5e077a0f546af6d6379eb93111fd8366fc2224)
@@ -49,6 +49,6 @@
         /// Gets the points associated with the <see cref="MapGeometry"/> defined in the
         /// RD-new coordinate system.
         /// </summary>
-        public IEnumerable<IEnumerable<Point2D>> PointCollections { get; private set; }
+        public IEnumerable<IEnumerable<Point2D>> PointCollections { get; }
     }
 }
\ No newline at end of file
Index: Core/Components/src/Core.Components.Gis/Style/LineStyle.cs
===================================================================
diff -u -rbee45bfbe50673fef6b944b92a2cb26665d46354 -r2c5e077a0f546af6d6379eb93111fd8366fc2224
--- Core/Components/src/Core.Components.Gis/Style/LineStyle.cs	(.../LineStyle.cs)	(revision bee45bfbe50673fef6b944b92a2cb26665d46354)
+++ Core/Components/src/Core.Components.Gis/Style/LineStyle.cs	(.../LineStyle.cs)	(revision 2c5e077a0f546af6d6379eb93111fd8366fc2224)
@@ -21,7 +21,6 @@
 
 using System;
 using System.Drawing;
-using System.Drawing.Drawing2D;
 using Core.Common.Base.Data;
 using Core.Components.Gis.Properties;
 
Index: Core/Components/src/Core.Components.GraphSharp.Forms/Extensions/TextBlockExtensions.cs
===================================================================
diff -u -rd09f1d9a3ec9133e8a671db7131e5f92de8f0ea4 -r2c5e077a0f546af6d6379eb93111fd8366fc2224
--- Core/Components/src/Core.Components.GraphSharp.Forms/Extensions/TextBlockExtensions.cs	(.../TextBlockExtensions.cs)	(revision d09f1d9a3ec9133e8a671db7131e5f92de8f0ea4)
+++ Core/Components/src/Core.Components.GraphSharp.Forms/Extensions/TextBlockExtensions.cs	(.../TextBlockExtensions.cs)	(revision 2c5e077a0f546af6d6379eb93111fd8366fc2224)
@@ -43,7 +43,7 @@
         {
             return (string) element.GetValue(FormattedTextProperty);
         }
-        
+
         private static void FormattedTextChanged(DependencyObject sender, DependencyPropertyChangedEventArgs eventArgs)
         {
             var textBlock = sender as TextBlock;
Index: Core/Components/src/Core.Components.GraphSharp/Commands/VertexSelectedCommand.cs
===================================================================
diff -u -r970117e11f904274852d266c6143cf47e3e5771f -r2c5e077a0f546af6d6379eb93111fd8366fc2224
--- Core/Components/src/Core.Components.GraphSharp/Commands/VertexSelectedCommand.cs	(.../VertexSelectedCommand.cs)	(revision 970117e11f904274852d266c6143cf47e3e5771f)
+++ Core/Components/src/Core.Components.GraphSharp/Commands/VertexSelectedCommand.cs	(.../VertexSelectedCommand.cs)	(revision 2c5e077a0f546af6d6379eb93111fd8366fc2224)
@@ -32,6 +32,8 @@
     {
         private readonly PointedTreeElementVertex vertex;
 
+        public event EventHandler CanExecuteChanged;
+
         /// <summary>
         /// Creates a new instance of <see cref="VertexSelectedCommand"/>.
         /// </summary>
@@ -57,7 +59,5 @@
         {
             return vertex.IsSelectable;
         }
-
-        public event EventHandler CanExecuteChanged;
     }
 }
\ No newline at end of file
Index: Core/Components/src/Core.Components.GraphSharp/Data/PointedTreeEdge.cs
===================================================================
diff -u -r308e44c50fc1f235b99663e3ab6a8f309a4cc3cb -r2c5e077a0f546af6d6379eb93111fd8366fc2224
--- Core/Components/src/Core.Components.GraphSharp/Data/PointedTreeEdge.cs	(.../PointedTreeEdge.cs)	(revision 308e44c50fc1f235b99663e3ab6a8f309a4cc3cb)
+++ Core/Components/src/Core.Components.GraphSharp/Data/PointedTreeEdge.cs	(.../PointedTreeEdge.cs)	(revision 2c5e077a0f546af6d6379eb93111fd8366fc2224)
@@ -36,4 +36,4 @@
         /// <param name="target">The target of the edge.</param>
         public PointedTreeEdge(PointedTreeElementVertex source, PointedTreeElementVertex target) : base(source, target) {}
     }
-}
+}
\ No newline at end of file
Index: Core/Components/src/Core.Components.OxyPlot.Forms/Extent.cs
===================================================================
diff -u -r09ab76fbe4f768414ad7dd356eb9b2ebd5b1781c -r2c5e077a0f546af6d6379eb93111fd8366fc2224
--- Core/Components/src/Core.Components.OxyPlot.Forms/Extent.cs	(.../Extent.cs)	(revision 09ab76fbe4f768414ad7dd356eb9b2ebd5b1781c)
+++ Core/Components/src/Core.Components.OxyPlot.Forms/Extent.cs	(.../Extent.cs)	(revision 2c5e077a0f546af6d6379eb93111fd8366fc2224)
@@ -76,6 +76,21 @@
         public double YMax { get; private set; }
 
         /// <summary>
+        /// Gets a value indicating whether values were
+        /// given to the properties.
+        /// </summary>
+        public bool IsNaN
+        {
+            get
+            {
+                return double.IsNaN(XMin)
+                       || double.IsNaN(XMax)
+                       || double.IsNaN(YMin)
+                       || double.IsNaN(YMax);
+            }
+        }
+
+        /// <summary>
         /// Adds padding to the extent and returns the new
         /// extent.
         /// </summary>
@@ -92,26 +107,11 @@
                 XMin = XMin - xPadding,
                 XMax = XMax + xPadding,
                 YMin = YMin - yPadding,
-                YMax = YMax + yPadding,
+                YMax = YMax + yPadding
             };
         }
 
         /// <summary>
-        /// Gets a value indicating whether values were
-        /// given to the properties.
-        /// </summary>
-        public bool IsNaN
-        {
-            get
-            {
-                return double.IsNaN(XMin)
-                        || double.IsNaN(XMax)
-                        || double.IsNaN(YMin)
-                        || double.IsNaN(YMax);
-            }
-        }
-
-        /// <summary>
         /// Assigns new values to the properties in such a way
         /// that the new values include both the <see cref="Extent"/>
         /// and the <paramref name="otherExtent"/>.
Index: Core/Components/src/Core.Components.OxyPlot.Forms/StackChartControl.cs
===================================================================
diff -u -r9d6009f11b5c63518c693e3d3be199ca9279015d -r2c5e077a0f546af6d6379eb93111fd8366fc2224
--- Core/Components/src/Core.Components.OxyPlot.Forms/StackChartControl.cs	(.../StackChartControl.cs)	(revision 9d6009f11b5c63518c693e3d3be199ca9279015d)
+++ Core/Components/src/Core.Components.OxyPlot.Forms/StackChartControl.cs	(.../StackChartControl.cs)	(revision 2c5e077a0f546af6d6379eb93111fd8366fc2224)
@@ -35,9 +35,9 @@
     public class StackChartControl : Control, IStackChartControl
     {
         private readonly CategoryPlotView plotView;
-        private StackChartData data;
 
         private readonly Observer stackChartDataObserver;
+        private StackChartData data;
 
         /// <summary>
         /// Creates a new <see cref="StackChartControl"/>.
@@ -58,6 +58,18 @@
             stackChartDataObserver = new Observer(HandleStackChartDataChange);
         }
 
+        public string VerticalAxisTitle
+        {
+            get
+            {
+                return plotView.VerticalAxisTitle;
+            }
+            set
+            {
+                plotView.VerticalAxisTitle = value;
+            }
+        }
+
         public StackChartData Data
         {
             get
@@ -93,18 +105,6 @@
             }
         }
 
-        public string VerticalAxisTitle
-        {
-            get
-            {
-                return plotView.VerticalAxisTitle;
-            }
-            set
-            {
-                plotView.VerticalAxisTitle = value;
-            }
-        }
-
         protected override void Dispose(bool disposing)
         {
             plotView.Dispose();
Index: Core/Components/src/Core.Components.OxyPlot/Converter/ChartDataHelper.cs
===================================================================
diff -u -r6237af4606598e43ebf0b3815a12677277c6eda0 -r2c5e077a0f546af6d6379eb93111fd8366fc2224
--- Core/Components/src/Core.Components.OxyPlot/Converter/ChartDataHelper.cs	(.../ChartDataHelper.cs)	(revision 6237af4606598e43ebf0b3815a12677277c6eda0)
+++ Core/Components/src/Core.Components.OxyPlot/Converter/ChartDataHelper.cs	(.../ChartDataHelper.cs)	(revision 2c5e077a0f546af6d6379eb93111fd8366fc2224)
@@ -19,7 +19,6 @@
 // Stichting Deltares and remain full property of Stichting Deltares at all times.
 // All rights reserved.
 
-using System;
 using System.ComponentModel;
 using System.Drawing;
 using Core.Components.Chart.Data;
Index: Core/Components/src/Core.Components.OxyPlot/CustomSeries/MultipleAreaSeries.cs
===================================================================
diff -u -raefd4f8600e09ea77d5bc37ffc56766763d5dcde -r2c5e077a0f546af6d6379eb93111fd8366fc2224
--- Core/Components/src/Core.Components.OxyPlot/CustomSeries/MultipleAreaSeries.cs	(.../MultipleAreaSeries.cs)	(revision aefd4f8600e09ea77d5bc37ffc56766763d5dcde)
+++ Core/Components/src/Core.Components.OxyPlot/CustomSeries/MultipleAreaSeries.cs	(.../MultipleAreaSeries.cs)	(revision 2c5e077a0f546af6d6379eb93111fd8366fc2224)
@@ -92,7 +92,7 @@
             {
                 throw new ArgumentNullException(nameof(renderContext));
             }
-            
+
             if (!Areas.Any() || Areas.All(a => !a.Any()))
             {
                 return;
Index: Core/Components/src/Core.Components.OxyPlot/DataSeries/Chart/ChartMultipleLineDataSeries.cs
===================================================================
diff -u -rbf790921e622ee49149a92e6b52668fb30d6e3a6 -r2c5e077a0f546af6d6379eb93111fd8366fc2224
--- Core/Components/src/Core.Components.OxyPlot/DataSeries/Chart/ChartMultipleLineDataSeries.cs	(.../ChartMultipleLineDataSeries.cs)	(revision bf790921e622ee49149a92e6b52668fb30d6e3a6)
+++ Core/Components/src/Core.Components.OxyPlot/DataSeries/Chart/ChartMultipleLineDataSeries.cs	(.../ChartMultipleLineDataSeries.cs)	(revision 2c5e077a0f546af6d6379eb93111fd8366fc2224)
@@ -69,4 +69,4 @@
             converter.ConvertSeriesProperties(chartMultipleLineData, this);
         }
     }
-}
+}
\ No newline at end of file
Index: Core/Components/src/Core.Components.OxyPlot/DataSeries/Stack/RowChartDataSeries.cs
===================================================================
diff -u -r913c61b285d09c32728540f4380296ea6a5d08be -r2c5e077a0f546af6d6379eb93111fd8366fc2224
--- Core/Components/src/Core.Components.OxyPlot/DataSeries/Stack/RowChartDataSeries.cs	(.../RowChartDataSeries.cs)	(revision 913c61b285d09c32728540f4380296ea6a5d08be)
+++ Core/Components/src/Core.Components.OxyPlot/DataSeries/Stack/RowChartDataSeries.cs	(.../RowChartDataSeries.cs)	(revision 2c5e077a0f546af6d6379eb93111fd8366fc2224)
@@ -45,7 +45,7 @@
 
             IsStacked = true;
             StrokeThickness = 1;
-            
+
             RowChartDataConverter.ConvertSeriesData(rowChartData, this);
             RowChartDataConverter.ConvertSeriesProperties(rowChartData, this);
         }
Index: Core/Components/src/Core.Components.OxyPlot/DataSeries/Stack/RowChartDataSeriesFactory.cs
===================================================================
diff -u -rb289035f9dc849df937a2d1049da17b28c689e02 -r2c5e077a0f546af6d6379eb93111fd8366fc2224
--- Core/Components/src/Core.Components.OxyPlot/DataSeries/Stack/RowChartDataSeriesFactory.cs	(.../RowChartDataSeriesFactory.cs)	(revision b289035f9dc849df937a2d1049da17b28c689e02)
+++ Core/Components/src/Core.Components.OxyPlot/DataSeries/Stack/RowChartDataSeriesFactory.cs	(.../RowChartDataSeriesFactory.cs)	(revision 2c5e077a0f546af6d6379eb93111fd8366fc2224)
@@ -46,7 +46,7 @@
             foreach (RowChartData row in data.Rows)
             {
                 yield return new RowChartDataSeries(row);
-            }            
+            }
         }
     }
 }
\ No newline at end of file
Index: Core/Components/src/Core.Components.PointedTree/Core.Components.PointedTree.csproj
===================================================================
diff -u -r95d9fe65a46c2fbd58388014f903ab9dd4d9e25c -r2c5e077a0f546af6d6379eb93111fd8366fc2224
--- Core/Components/src/Core.Components.PointedTree/Core.Components.PointedTree.csproj	(.../Core.Components.PointedTree.csproj)	(revision 95d9fe65a46c2fbd58388014f903ab9dd4d9e25c)
+++ Core/Components/src/Core.Components.PointedTree/Core.Components.PointedTree.csproj	(.../Core.Components.PointedTree.csproj)	(revision 2c5e077a0f546af6d6379eb93111fd8366fc2224)
@@ -67,6 +67,7 @@
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Index: Core/Components/test/Core.Components.BruTile.TestUtil/TileSchemaFactory.cs
===================================================================
diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -r2c5e077a0f546af6d6379eb93111fd8366fc2224
--- Core/Components/test/Core.Components.BruTile.TestUtil/TileSchemaFactory.cs	(.../TileSchemaFactory.cs)	(revision 67284323e2785c651633d9c52049ba12a9c70e6a)
+++ Core/Components/test/Core.Components.BruTile.TestUtil/TileSchemaFactory.cs	(.../TileSchemaFactory.cs)	(revision 2c5e077a0f546af6d6379eb93111fd8366fc2224)
@@ -43,7 +43,7 @@
         {
             if (!mapData.IsConfigured)
             {
-                throw new ArgumentException($"Only configured {typeof(WmtsMapData).Name} instances can be used to create a schema for.",
+                throw new ArgumentException($@"Only configured {typeof(WmtsMapData).Name} instances can be used to create a schema for.",
                                             nameof(mapData));
             }
 
Index: Core/Components/test/Core.Components.DotSpatial.Forms.Test/DotSpatialMapTest.cs
===================================================================
diff -u -rd1b6ecd5c987d476725fe7a5f242a358e3748edb -r2c5e077a0f546af6d6379eb93111fd8366fc2224
--- Core/Components/test/Core.Components.DotSpatial.Forms.Test/DotSpatialMapTest.cs	(.../DotSpatialMapTest.cs)	(revision d1b6ecd5c987d476725fe7a5f242a358e3748edb)
+++ Core/Components/test/Core.Components.DotSpatial.Forms.Test/DotSpatialMapTest.cs	(.../DotSpatialMapTest.cs)	(revision 2c5e077a0f546af6d6379eb93111fd8366fc2224)
@@ -86,6 +86,8 @@
 
         private class IgnoreOnNoInternetAttribute : Attribute, ITestAction
         {
+            public ActionTargets Targets { get; }
+
             public void BeforeTest(ITest test)
             {
                 bool ignore;
@@ -106,9 +108,7 @@
                 }
             }
 
-            public void AfterTest(ITest test) { }
-
-            public ActionTargets Targets { get; }
+            public void AfterTest(ITest test) {}
         }
     }
 }
\ No newline at end of file
Index: Core/Components/test/Core.Components.DotSpatial.Test/Converter/FeatureBasedMapDataConverterTest.cs
===================================================================
diff -u -r081badaad87a6e2a6d5c861de9ee95fa1ca6dea3 -r2c5e077a0f546af6d6379eb93111fd8366fc2224
--- Core/Components/test/Core.Components.DotSpatial.Test/Converter/FeatureBasedMapDataConverterTest.cs	(.../FeatureBasedMapDataConverterTest.cs)	(revision 081badaad87a6e2a6d5c861de9ee95fa1ca6dea3)
+++ Core/Components/test/Core.Components.DotSpatial.Test/Converter/FeatureBasedMapDataConverterTest.cs	(.../FeatureBasedMapDataConverterTest.cs)	(revision 2c5e077a0f546af6d6379eb93111fd8366fc2224)
@@ -416,7 +416,7 @@
             Assert.AreEqual("FID", labelCategory.Symbolizer.PriorityField);
             Assert.AreEqual(ContentAlignment.MiddleRight, labelCategory.Symbolizer.Orientation);
             Assert.AreEqual(5, labelCategory.Symbolizer.OffsetX);
-            Assert.AreEqual(string.Format("[{0}]", "2"), labelCategory.Expression);
+            Assert.AreEqual("[2]", labelCategory.Expression);
         }
 
         [TestCase(true)]
Index: Core/Components/test/Core.Components.Gis.Forms.Test/Views/WmtsLocationControlTest.cs
===================================================================
diff -u -rfe90a6d174a01975381e6cda55ed1f7f4e831a51 -r2c5e077a0f546af6d6379eb93111fd8366fc2224
--- Core/Components/test/Core.Components.Gis.Forms.Test/Views/WmtsLocationControlTest.cs	(.../WmtsLocationControlTest.cs)	(revision fe90a6d174a01975381e6cda55ed1f7f4e831a51)
+++ Core/Components/test/Core.Components.Gis.Forms.Test/Views/WmtsLocationControlTest.cs	(.../WmtsLocationControlTest.cs)	(revision 2c5e077a0f546af6d6379eb93111fd8366fc2224)
@@ -947,9 +947,9 @@
 
         private static void WriteToFile(string filePath, WmtsConnectionInfo wmtsConnectionInfo)
         {
-            File.WriteAllText(filePath, "<?xml version=\"1.0\" encoding=\"utf-8\"?><WmtsConnections><WmtsConnection>" +
-                                        $"<Name>{wmtsConnectionInfo.Name}</Name><URL>{wmtsConnectionInfo.Url}</URL>" +
-                                        "</WmtsConnection></WmtsConnections>");
+            File.WriteAllText(filePath, @"<?xml version=""1.0"" encoding=""utf-8""?><WmtsConnections><WmtsConnection>" +
+                                        $@"<Name>{wmtsConnectionInfo.Name}</Name><URL>{wmtsConnectionInfo.Url}</URL>" +
+                                        @"</WmtsConnection></WmtsConnections>");
         }
     }
 }
\ No newline at end of file
Index: Core/Components/test/Core.Components.Gis.IO.Test/Importers/FeatureBasedMapDataImporterTest.cs
===================================================================
diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -r2c5e077a0f546af6d6379eb93111fd8366fc2224
--- Core/Components/test/Core.Components.Gis.IO.Test/Importers/FeatureBasedMapDataImporterTest.cs	(.../FeatureBasedMapDataImporterTest.cs)	(revision 67284323e2785c651633d9c52049ba12a9c70e6a)
+++ Core/Components/test/Core.Components.Gis.IO.Test/Importers/FeatureBasedMapDataImporterTest.cs	(.../FeatureBasedMapDataImporterTest.cs)	(revision 2c5e077a0f546af6d6379eb93111fd8366fc2224)
@@ -61,7 +61,8 @@
             Action call = () => importSuccessful = importer.Import();
 
             // Assert
-            string expectedMessage = string.Format(@"Fout bij het lezen van bestand '{0}': het bestand of andere benodigde bestanden zijn niet gevonden.", path) + Environment.NewLine +
+            string expectedMessage = $@"Fout bij het lezen van bestand '{path}': het bestand of andere benodigde bestanden zijn niet gevonden."
+                                     + Environment.NewLine +
                                      "Er is geen kaartlaag geïmporteerd.";
             TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 1);
             Assert.IsFalse(importSuccessful);
@@ -80,7 +81,8 @@
             Action call = () => importSuccessful = importer.Import();
 
             // Assert
-            string expectedMessage = string.Format(@"Fout bij het lezen van bestand '{0}': kon geen geometrieën vinden in dit bestand.", path) + Environment.NewLine +
+            string expectedMessage = $@"Fout bij het lezen van bestand '{path}': kon geen geometrieën vinden in dit bestand."
+                                     + Environment.NewLine +
                                      "Er is geen kaartlaag geïmporteerd.";
             TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 1);
             Assert.IsFalse(importSuccessful);
Index: Core/Components/test/Core.Components.Gis.IO.Test/Readers/ShapeFileReaderBaseTest.cs
===================================================================
diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -r2c5e077a0f546af6d6379eb93111fd8366fc2224
--- Core/Components/test/Core.Components.Gis.IO.Test/Readers/ShapeFileReaderBaseTest.cs	(.../ShapeFileReaderBaseTest.cs)	(revision 67284323e2785c651633d9c52049ba12a9c70e6a)
+++ Core/Components/test/Core.Components.Gis.IO.Test/Readers/ShapeFileReaderBaseTest.cs	(.../ShapeFileReaderBaseTest.cs)	(revision 2c5e077a0f546af6d6379eb93111fd8366fc2224)
@@ -63,8 +63,7 @@
             TestDelegate call = () => new TestShapeFileReaderBase(invalidFilePath);
 
             // Assert
-            string expectedMessage = string.Format("Fout bij het lezen van bestand '{0}': bestandspad mag niet leeg of ongedefinieerd zijn.",
-                                                   invalidFilePath);
+            string expectedMessage = $"Fout bij het lezen van bestand '{invalidFilePath}': bestandspad mag niet leeg of ongedefinieerd zijn.";
             TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(call, expectedMessage);
         }
 
@@ -77,8 +76,7 @@
             TestDelegate call = () => new TestShapeFileReaderBase(pathToNotExistingShapeFile);
 
             // Assert
-            string expectedMessage = string.Format("Fout bij het lezen van bestand '{0}': het bestand bestaat niet.",
-                                                   pathToNotExistingShapeFile);
+            string expectedMessage = $"Fout bij het lezen van bestand '{pathToNotExistingShapeFile}': het bestand bestaat niet.";
             string message = Assert.Throws<CriticalFileReadException>(call).Message;
             Assert.AreEqual(expectedMessage, message);
         }
@@ -113,8 +111,7 @@
             TestDelegate call = () => new TestShapeFileReaderBase(invalidFilePath);
 
             // Assert
-            string expectedMessage = string.Format("Fout bij het lezen van bestand '{0}': bestandspad mag niet verwijzen naar een lege bestandsnaam.",
-                                                   invalidFilePath);
+            string expectedMessage = $"Fout bij het lezen van bestand '{invalidFilePath}': bestandspad mag niet verwijzen naar een lege bestandsnaam.";
             TestHelper.AssertThrowsArgumentExceptionAndTestMessage<ArgumentException>(call, expectedMessage);
         }
 
Index: Core/Components/test/Core.Components.Gis.Test/Data/Removable/RemovableMapLineDataTest.cs
===================================================================
diff -u -r80b47b0f25191655ae00b3e1db94dad8f0ad75b0 -r2c5e077a0f546af6d6379eb93111fd8366fc2224
--- Core/Components/test/Core.Components.Gis.Test/Data/Removable/RemovableMapLineDataTest.cs	(.../RemovableMapLineDataTest.cs)	(revision 80b47b0f25191655ae00b3e1db94dad8f0ad75b0)
+++ Core/Components/test/Core.Components.Gis.Test/Data/Removable/RemovableMapLineDataTest.cs	(.../RemovableMapLineDataTest.cs)	(revision 2c5e077a0f546af6d6379eb93111fd8366fc2224)
@@ -39,7 +39,7 @@
             Assert.IsInstanceOf<MapLineData>(data);
             Assert.IsInstanceOf<IRemovable>(data);
         }
-        
+
         [Test]
         public void Constructor_WithStyle_ExpectedValues()
         {
Index: Core/Components/test/Core.Components.GraphSharp.Test/Converters/GraphNodeConverterTest.cs
===================================================================
diff -u -r62923c1147ab44c7716d00174a795101affc0178 -r2c5e077a0f546af6d6379eb93111fd8366fc2224
--- Core/Components/test/Core.Components.GraphSharp.Test/Converters/GraphNodeConverterTest.cs	(.../GraphNodeConverterTest.cs)	(revision 62923c1147ab44c7716d00174a795101affc0178)
+++ Core/Components/test/Core.Components.GraphSharp.Test/Converters/GraphNodeConverterTest.cs	(.../GraphNodeConverterTest.cs)	(revision 2c5e077a0f546af6d6379eb93111fd8366fc2224)
@@ -27,6 +27,7 @@
 using Core.Components.GraphSharp.Data;
 using Core.Components.PointedTree.Data;
 using NUnit.Framework;
+using Brush = System.Windows.Media.Brush;
 using Color = System.Drawing.Color;
 using WpfColor = System.Windows.Media.Color;
 
Index: Core/Components/test/Core.Components.GraphSharp.TestUtil.Test/PointedTreeTestDataFactoryTest.cs
===================================================================
diff -u -rcb69fd000052c66da4bef6acc320330fb36b27c7 -r2c5e077a0f546af6d6379eb93111fd8366fc2224
--- Core/Components/test/Core.Components.GraphSharp.TestUtil.Test/PointedTreeTestDataFactoryTest.cs	(.../PointedTreeTestDataFactoryTest.cs)	(revision cb69fd000052c66da4bef6acc320330fb36b27c7)
+++ Core/Components/test/Core.Components.GraphSharp.TestUtil.Test/PointedTreeTestDataFactoryTest.cs	(.../PointedTreeTestDataFactoryTest.cs)	(revision 2c5e077a0f546af6d6379eb93111fd8366fc2224)
@@ -40,4 +40,4 @@
             Assert.AreEqual(isSelectable, pointedTreeElementVertex.IsSelectable);
         }
     }
-}
+}
\ No newline at end of file
Index: Core/Components/test/Core.Components.OxyPlot.Forms.Test/ChartControlTest.cs
===================================================================
diff -u -r92ad90957cbb4208bb2b53c4ea9e03a1d7859ab1 -r2c5e077a0f546af6d6379eb93111fd8366fc2224
--- Core/Components/test/Core.Components.OxyPlot.Forms.Test/ChartControlTest.cs	(.../ChartControlTest.cs)	(revision 92ad90957cbb4208bb2b53c4ea9e03a1d7859ab1)
+++ Core/Components/test/Core.Components.OxyPlot.Forms.Test/ChartControlTest.cs	(.../ChartControlTest.cs)	(revision 2c5e077a0f546af6d6379eb93111fd8366fc2224)
@@ -406,6 +406,15 @@
             }
         }
 
+        private void AssertExpectedExtent(ElementCollection<Axis> modelAxes, Extent expectedExtent)
+        {
+            const double accuracy = 1e-8;
+            Assert.AreEqual(expectedExtent.XMin, modelAxes[0].ActualMinimum, Math.Abs(expectedExtent.XMin * accuracy));
+            Assert.AreEqual(expectedExtent.XMax, modelAxes[0].ActualMaximum, Math.Abs(expectedExtent.XMax * accuracy));
+            Assert.AreEqual(expectedExtent.YMin, modelAxes[1].ActualMinimum, Math.Abs(expectedExtent.YMin * accuracy));
+            Assert.AreEqual(expectedExtent.YMax, modelAxes[1].ActualMaximum, Math.Abs(expectedExtent.YMax * accuracy));
+        }
+
         #region ZoomToAllVisibleLayers
 
         [Test]
@@ -726,14 +735,5 @@
         }
 
         #endregion
-
-        private void AssertExpectedExtent(ElementCollection<Axis> modelAxes, Extent expectedExtent)
-        {
-            const double accuracy = 1e-8;
-            Assert.AreEqual(expectedExtent.XMin, modelAxes[0].ActualMinimum, Math.Abs(expectedExtent.XMin * accuracy));
-            Assert.AreEqual(expectedExtent.XMax, modelAxes[0].ActualMaximum, Math.Abs(expectedExtent.XMax * accuracy));
-            Assert.AreEqual(expectedExtent.YMin, modelAxes[1].ActualMinimum, Math.Abs(expectedExtent.YMin * accuracy));
-            Assert.AreEqual(expectedExtent.YMax, modelAxes[1].ActualMaximum, Math.Abs(expectedExtent.YMax * accuracy));
-        }
     }
 }
\ No newline at end of file
Index: Core/Components/test/Core.Components.OxyPlot.Test/DataSeries/Chart/ChartAreaDataSeriesTest.cs
===================================================================
diff -u -rbf790921e622ee49149a92e6b52668fb30d6e3a6 -r2c5e077a0f546af6d6379eb93111fd8366fc2224
--- Core/Components/test/Core.Components.OxyPlot.Test/DataSeries/Chart/ChartAreaDataSeriesTest.cs	(.../ChartAreaDataSeriesTest.cs)	(revision bf790921e622ee49149a92e6b52668fb30d6e3a6)
+++ Core/Components/test/Core.Components.OxyPlot.Test/DataSeries/Chart/ChartAreaDataSeriesTest.cs	(.../ChartAreaDataSeriesTest.cs)	(revision 2c5e077a0f546af6d6379eb93111fd8366fc2224)
@@ -24,7 +24,6 @@
 using Core.Common.Base.Geometry;
 using Core.Components.Chart.Data;
 using Core.Components.Chart.Styles;
-using Core.Components.OxyPlot.DataSeries;
 using Core.Components.OxyPlot.DataSeries.Chart;
 using NUnit.Framework;
 using OxyPlot;
Index: Core/Components/test/Core.Components.OxyPlot.Test/DataSeries/Chart/ChartDataSeriesFactoryTest.cs
===================================================================
diff -u -rbf790921e622ee49149a92e6b52668fb30d6e3a6 -r2c5e077a0f546af6d6379eb93111fd8366fc2224
--- Core/Components/test/Core.Components.OxyPlot.Test/DataSeries/Chart/ChartDataSeriesFactoryTest.cs	(.../ChartDataSeriesFactoryTest.cs)	(revision bf790921e622ee49149a92e6b52668fb30d6e3a6)
+++ Core/Components/test/Core.Components.OxyPlot.Test/DataSeries/Chart/ChartDataSeriesFactoryTest.cs	(.../ChartDataSeriesFactoryTest.cs)	(revision 2c5e077a0f546af6d6379eb93111fd8366fc2224)
@@ -22,7 +22,6 @@
 using System;
 using Core.Components.Chart.Data;
 using Core.Components.Chart.TestUtil;
-using Core.Components.OxyPlot.DataSeries;
 using Core.Components.OxyPlot.DataSeries.Chart;
 using NUnit.Framework;
 
Index: Core/Components/test/Core.Components.OxyPlot.Test/DataSeries/Chart/ChartLineDataSeriesTest.cs
===================================================================
diff -u -rbf790921e622ee49149a92e6b52668fb30d6e3a6 -r2c5e077a0f546af6d6379eb93111fd8366fc2224
--- Core/Components/test/Core.Components.OxyPlot.Test/DataSeries/Chart/ChartLineDataSeriesTest.cs	(.../ChartLineDataSeriesTest.cs)	(revision bf790921e622ee49149a92e6b52668fb30d6e3a6)
+++ Core/Components/test/Core.Components.OxyPlot.Test/DataSeries/Chart/ChartLineDataSeriesTest.cs	(.../ChartLineDataSeriesTest.cs)	(revision 2c5e077a0f546af6d6379eb93111fd8366fc2224)
@@ -26,7 +26,6 @@
 using Core.Common.Base.Geometry;
 using Core.Components.Chart.Data;
 using Core.Components.Chart.Styles;
-using Core.Components.OxyPlot.DataSeries;
 using Core.Components.OxyPlot.DataSeries.Chart;
 using NUnit.Framework;
 using OxyPlot;
Index: Core/Components/test/Core.Components.OxyPlot.Test/DataSeries/Chart/ChartMultipleAreaDataSeriesTest.cs
===================================================================
diff -u -rbf790921e622ee49149a92e6b52668fb30d6e3a6 -r2c5e077a0f546af6d6379eb93111fd8366fc2224
--- Core/Components/test/Core.Components.OxyPlot.Test/DataSeries/Chart/ChartMultipleAreaDataSeriesTest.cs	(.../ChartMultipleAreaDataSeriesTest.cs)	(revision bf790921e622ee49149a92e6b52668fb30d6e3a6)
+++ Core/Components/test/Core.Components.OxyPlot.Test/DataSeries/Chart/ChartMultipleAreaDataSeriesTest.cs	(.../ChartMultipleAreaDataSeriesTest.cs)	(revision 2c5e077a0f546af6d6379eb93111fd8366fc2224)
@@ -26,7 +26,6 @@
 using Core.Components.Chart.Data;
 using Core.Components.Chart.Styles;
 using Core.Components.OxyPlot.CustomSeries;
-using Core.Components.OxyPlot.DataSeries;
 using Core.Components.OxyPlot.DataSeries.Chart;
 using NUnit.Framework;
 using OxyPlot;
Index: Core/Components/test/Core.Components.OxyPlot.Test/DataSeries/Chart/ChartMultipleLineDataSeriesTest.cs
===================================================================
diff -u -rbf790921e622ee49149a92e6b52668fb30d6e3a6 -r2c5e077a0f546af6d6379eb93111fd8366fc2224
--- Core/Components/test/Core.Components.OxyPlot.Test/DataSeries/Chart/ChartMultipleLineDataSeriesTest.cs	(.../ChartMultipleLineDataSeriesTest.cs)	(revision bf790921e622ee49149a92e6b52668fb30d6e3a6)
+++ Core/Components/test/Core.Components.OxyPlot.Test/DataSeries/Chart/ChartMultipleLineDataSeriesTest.cs	(.../ChartMultipleLineDataSeriesTest.cs)	(revision 2c5e077a0f546af6d6379eb93111fd8366fc2224)
@@ -26,7 +26,6 @@
 using Core.Components.Chart.Data;
 using Core.Components.Chart.Styles;
 using Core.Components.OxyPlot.CustomSeries;
-using Core.Components.OxyPlot.DataSeries;
 using Core.Components.OxyPlot.DataSeries.Chart;
 using NUnit.Framework;
 using OxyPlot;
Index: Core/Components/test/Core.Components.OxyPlot.Test/DataSeries/Chart/ChartPointDataSeriesTest.cs
===================================================================
diff -u -rbf790921e622ee49149a92e6b52668fb30d6e3a6 -r2c5e077a0f546af6d6379eb93111fd8366fc2224
--- Core/Components/test/Core.Components.OxyPlot.Test/DataSeries/Chart/ChartPointDataSeriesTest.cs	(.../ChartPointDataSeriesTest.cs)	(revision bf790921e622ee49149a92e6b52668fb30d6e3a6)
+++ Core/Components/test/Core.Components.OxyPlot.Test/DataSeries/Chart/ChartPointDataSeriesTest.cs	(.../ChartPointDataSeriesTest.cs)	(revision 2c5e077a0f546af6d6379eb93111fd8366fc2224)
@@ -26,7 +26,6 @@
 using Core.Common.Base.Geometry;
 using Core.Components.Chart.Data;
 using Core.Components.Chart.Styles;
-using Core.Components.OxyPlot.DataSeries;
 using Core.Components.OxyPlot.DataSeries.Chart;
 using NUnit.Framework;
 using OxyPlot;
Index: Core/Plugins/src/Core.Plugins.Chart/Legend/ChartLegendController.cs
===================================================================
diff -u -r93036b575ee81b4517b29db51f1eadf81454fb93 -r2c5e077a0f546af6d6379eb93111fd8366fc2224
--- Core/Plugins/src/Core.Plugins.Chart/Legend/ChartLegendController.cs	(.../ChartLegendController.cs)	(revision 93036b575ee81b4517b29db51f1eadf81454fb93)
+++ Core/Plugins/src/Core.Plugins.Chart/Legend/ChartLegendController.cs	(.../ChartLegendController.cs)	(revision 2c5e077a0f546af6d6379eb93111fd8366fc2224)
@@ -21,7 +21,6 @@
 
 using System;
 using System.Linq;
-using Core.Common.Controls.Views;
 using Core.Common.Gui;
 using Core.Common.Gui.ContextMenu;
 using Core.Common.Gui.Forms.ViewHost;
Index: Core/Plugins/src/Core.Plugins.Chart/Legend/ChartLegendView.cs
===================================================================
diff -u -r67e77262b9f0f183db81f8c95d7b12aa5fcdb8e9 -r2c5e077a0f546af6d6379eb93111fd8366fc2224
--- Core/Plugins/src/Core.Plugins.Chart/Legend/ChartLegendView.cs	(.../ChartLegendView.cs)	(revision 67e77262b9f0f183db81f8c95d7b12aa5fcdb8e9)
+++ Core/Plugins/src/Core.Plugins.Chart/Legend/ChartLegendView.cs	(.../ChartLegendView.cs)	(revision 2c5e077a0f546af6d6379eb93111fd8366fc2224)
@@ -69,7 +69,7 @@
 
         public IChartControl ChartControl
         {
-            get
+            private get
             {
                 return chartControl;
             }
Index: Core/Plugins/src/Core.Plugins.Map/Legend/MapLegendView.cs
===================================================================
diff -u -r357925a9ba2aebce58a9e03e620c6d470323672f -r2c5e077a0f546af6d6379eb93111fd8366fc2224
--- Core/Plugins/src/Core.Plugins.Map/Legend/MapLegendView.cs	(.../MapLegendView.cs)	(revision 357925a9ba2aebce58a9e03e620c6d470323672f)
+++ Core/Plugins/src/Core.Plugins.Map/Legend/MapLegendView.cs	(.../MapLegendView.cs)	(revision 2c5e077a0f546af6d6379eb93111fd8366fc2224)
@@ -72,7 +72,7 @@
         /// </summary>
         public IMapControl MapControl
         {
-            get
+            private get
             {
                 return mapControl;
             }
@@ -83,6 +83,14 @@
             }
         }
 
+        public object Selection
+        {
+            get
+            {
+                return treeViewControl.SelectedData;
+            }
+        }
+
         public object Data
         {
             get
@@ -95,14 +103,6 @@
             }
         }
 
-        public object Selection
-        {
-            get
-            {
-                return treeViewControl.SelectedData;
-            }
-        }
-
         private void TreeViewControlSelectedDataChanged(object sender, EventArgs e)
         {
             SelectionChanged?.Invoke(this, new EventArgs());
Index: Core/Plugins/src/Core.Plugins.Map/MapPlugin.cs
===================================================================
diff -u -r75f679b341a9a7b82f35a623e6409ed28c74632f -r2c5e077a0f546af6d6379eb93111fd8366fc2224
--- Core/Plugins/src/Core.Plugins.Map/MapPlugin.cs	(.../MapPlugin.cs)	(revision 75f679b341a9a7b82f35a623e6409ed28c74632f)
+++ Core/Plugins/src/Core.Plugins.Map/MapPlugin.cs	(.../MapPlugin.cs)	(revision 2c5e077a0f546af6d6379eb93111fd8366fc2224)
@@ -107,7 +107,7 @@
             if (viewController == null)
             {
                 throw new ArgumentNullException(nameof(viewController),
-                                                $"Cannot create a {typeof(MapLegendController).Name} when the view controller is null");
+                                                $@"Cannot create a {typeof(MapLegendController).Name} when the view controller is null");
             }
 
             var controller = new MapLegendController(viewController, Gui);
Index: Core/Plugins/src/Core.Plugins.Map/PropertyClasses/MapLineDataProperties.cs
===================================================================
diff -u -rbee45bfbe50673fef6b944b92a2cb26665d46354 -r2c5e077a0f546af6d6379eb93111fd8366fc2224
--- Core/Plugins/src/Core.Plugins.Map/PropertyClasses/MapLineDataProperties.cs	(.../MapLineDataProperties.cs)	(revision bee45bfbe50673fef6b944b92a2cb26665d46354)
+++ Core/Plugins/src/Core.Plugins.Map/PropertyClasses/MapLineDataProperties.cs	(.../MapLineDataProperties.cs)	(revision 2c5e077a0f546af6d6379eb93111fd8366fc2224)
@@ -38,6 +38,14 @@
     /// </summary>
     public class MapLineDataProperties : FeatureBasedMapDataProperties<MapLineData>
     {
+        public override string Type
+        {
+            get
+            {
+                return Resources.FeatureBasedMapData_Type_Lines;
+            }
+        }
+
         [PropertyOrder(5)]
         [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Styling))]
         [ResourcesDisplayName(typeof(Resources), nameof(Resources.MapData_Color_DisplayName))]
@@ -91,13 +99,5 @@
                 data.NotifyObservers();
             }
         }
-
-        public override string Type
-        {
-            get
-            {
-                return Resources.FeatureBasedMapData_Type_Lines;
-            }
-        }
     }
 }
\ No newline at end of file
Index: Core/Plugins/src/Core.Plugins.Map/PropertyClasses/MapPointDataProperties.cs
===================================================================
diff -u -r5c6072174d8047b062655d56d523d74c5e740039 -r2c5e077a0f546af6d6379eb93111fd8366fc2224
--- Core/Plugins/src/Core.Plugins.Map/PropertyClasses/MapPointDataProperties.cs	(.../MapPointDataProperties.cs)	(revision 5c6072174d8047b062655d56d523d74c5e740039)
+++ Core/Plugins/src/Core.Plugins.Map/PropertyClasses/MapPointDataProperties.cs	(.../MapPointDataProperties.cs)	(revision 2c5e077a0f546af6d6379eb93111fd8366fc2224)
@@ -38,6 +38,14 @@
     /// </summary>
     public class MapPointDataProperties : FeatureBasedMapDataProperties<MapPointData>
     {
+        public override string Type
+        {
+            get
+            {
+                return Resources.FeatureBasedMapData_Type_Points;
+            }
+        }
+
         [PropertyOrder(5)]
         [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Styling))]
         [ResourcesDisplayName(typeof(Resources), nameof(Resources.MapData_Color_DisplayName))]
@@ -127,13 +135,5 @@
                 data.NotifyObservers();
             }
         }
-
-        public override string Type
-        {
-            get
-            {
-                return Resources.FeatureBasedMapData_Type_Points;
-            }
-        }
     }
 }
\ No newline at end of file
Index: Core/Plugins/src/Core.Plugins.Map/PropertyClasses/MapPolygonDataProperties.cs
===================================================================
diff -u -r5c6072174d8047b062655d56d523d74c5e740039 -r2c5e077a0f546af6d6379eb93111fd8366fc2224
--- Core/Plugins/src/Core.Plugins.Map/PropertyClasses/MapPolygonDataProperties.cs	(.../MapPolygonDataProperties.cs)	(revision 5c6072174d8047b062655d56d523d74c5e740039)
+++ Core/Plugins/src/Core.Plugins.Map/PropertyClasses/MapPolygonDataProperties.cs	(.../MapPolygonDataProperties.cs)	(revision 2c5e077a0f546af6d6379eb93111fd8366fc2224)
@@ -36,6 +36,14 @@
     /// </summary>
     public class MapPolygonDataProperties : FeatureBasedMapDataProperties<MapPolygonData>
     {
+        public override string Type
+        {
+            get
+            {
+                return Resources.FeatureBasedMapData_Type_Polygons;
+            }
+        }
+
         [PropertyOrder(5)]
         [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Styling))]
         [ResourcesDisplayName(typeof(Resources), nameof(Resources.MapData_Color_DisplayName))]
@@ -90,13 +98,5 @@
                 data.NotifyObservers();
             }
         }
-
-        public override string Type
-        {
-            get
-            {
-                return Resources.FeatureBasedMapData_Type_Polygons;
-            }
-        }
     }
 }
\ No newline at end of file
Index: Core/Plugins/test/Core.Plugins.Chart.Test/ChartPluginTest.cs
===================================================================
diff -u -r3178e116f5e59e03078d465efeb303c5e232c7bf -r2c5e077a0f546af6d6379eb93111fd8366fc2224
--- Core/Plugins/test/Core.Plugins.Chart.Test/ChartPluginTest.cs	(.../ChartPluginTest.cs)	(revision 3178e116f5e59e03078d465efeb303c5e232c7bf)
+++ Core/Plugins/test/Core.Plugins.Chart.Test/ChartPluginTest.cs	(.../ChartPluginTest.cs)	(revision 2c5e077a0f546af6d6379eb93111fd8366fc2224)
@@ -189,7 +189,6 @@
                     propertyInfos,
                     typeof(ChartPointData),
                     typeof(ChartPointDataProperties));
-
             }
         }
     }