KeithBrio · Nov 15, 2023 · Nov 15, 2023 · Nov 15, 2023 · Nov 15, 2023 · Nov 15, 2023
diff --git a/Source/Examples/ExampleLibrary/CustomSeries/LineSegmentSeries.cs b/Source/Examples/ExampleLibrary/CustomSeries/LineSegmentSeries.cs
@@ -90,7 +90,7 @@ public override void Render(IRenderContext rc)
                 rc.DrawLineSegments(verticalLines, this.ActualColor, this.StrokeThickness / 3, this.EdgeRenderingMode, LineStyle.Dash.GetDashArray(), this.LineJoin);
             }
 
-            rc.DrawMarkers(screenPoints, this.MarkerType, null, this.MarkerSize, this.MarkerFill, this.MarkerStroke, this.MarkerStrokeThickness, this.EdgeRenderingMode);
+            rc.DrawMarkers(screenPoints, this.MarkerType, null, this.MarkerSize, this.MarkerFill, this.MarkerStroke, this.MarkerStrokeThickness, this.EdgeRenderingMode, null);
         }
 
         /// <summary>

diff --git a/Source/Examples/ExampleLibrary/Series/LineSeriesExamples.cs b/Source/Examples/ExampleLibrary/Series/LineSeriesExamples.cs
@@ -168,8 +168,17 @@ public static PlotModel MarkerTypes()
                 ls.Color = OxyColors.Red;
                 ls.MarkerStroke = OxyColors.Black;
                 ls.MarkerFill = OxyColors.Green;
-                ls.MarkerType = (MarkerType)i++;
+                ls.MarkerStrokeThickness = 2;
+                ls.MarkerSize = 7;
+                ls.MarkerType = (MarkerType)i;
+                ls.MarkerLineStyle = (LineStyle)i;
+                if (i == 8)
+                {
+                    ls.MarkerType = MarkerType.Triangle;
+                }
                 ls.Title = ls.MarkerType.ToString();
+
+                i++;
             }
 
             return pm;

diff --git a/Source/Examples/PerformanceTest/EmptyRenderContext.cs b/Source/Examples/PerformanceTest/EmptyRenderContext.cs
@@ -27,12 +27,12 @@ public void CleanUp()
         }
 
         /// <inheritdoc/>
-        public void DrawEllipse(OxyRect extents, OxyColor fill, OxyColor stroke, double thickness, EdgeRenderingMode edgeRenderingMode)
+        public void DrawEllipse(OxyRect extents, OxyColor fill, OxyColor stroke, double thickness, EdgeRenderingMode edgeRenderingMode, double[] dashArray = null)
         {
         }
 
         /// <inheritdoc/>
-        public void DrawEllipses(IList<OxyRect> extents, OxyColor fill, OxyColor stroke, double thickness, EdgeRenderingMode edgeRenderingMode)
+        public void DrawEllipses(IList<OxyRect> extents, OxyColor fill, OxyColor stroke, double thickness, EdgeRenderingMode edgeRenderingMode, double[] dashArray = null)
         {
         }
 
@@ -75,12 +75,12 @@ public void DrawPolygons(IList<IList<ScreenPoint>> polygons, OxyColor fill, OxyC
         }
 
         /// <inheritdoc/>
-        public void DrawRectangle(OxyRect rectangle, OxyColor fill, OxyColor stroke, double thickness, EdgeRenderingMode edgeRenderingMode)
+        public void DrawRectangle(OxyRect rectangle, OxyColor fill, OxyColor stroke, double thickness, EdgeRenderingMode edgeRenderingMode, double[] dashArray)
         {
         }
 
         /// <inheritdoc/>
-        public void DrawRectangles(IList<OxyRect> rectangles, OxyColor fill, OxyColor stroke, double thickness, EdgeRenderingMode edgeRenderingMode)
+        public void DrawRectangles(IList<OxyRect> rectangles, OxyColor fill, OxyColor stroke, double thickness, EdgeRenderingMode edgeRenderingMode, double[] dashArray)
         {
         }
 

diff --git a/Source/OxyPlot.Pdf/PdfRenderContext.cs b/Source/OxyPlot.Pdf/PdfRenderContext.cs
@@ -81,7 +81,7 @@ public void Dispose()
         }
 
         /// <inheritdoc/>
-        public override void DrawEllipse(OxyRect rect, OxyColor fill, OxyColor stroke, double thickness, EdgeRenderingMode edgeRenderingMode)
+        public override void DrawEllipse(OxyRect rect, OxyColor fill, OxyColor stroke, double thickness, EdgeRenderingMode edgeRenderingMode, double[] dashArray = null)
         {
             this.SetSmoothingMode(this.ShouldUseAntiAliasingForEllipse(edgeRenderingMode));
 
@@ -179,7 +179,7 @@ public override void DrawPolygon(
         }
 
         /// <inheritdoc/>
-        public override void DrawRectangle(OxyRect rect, OxyColor fill, OxyColor stroke, double thickness, EdgeRenderingMode edgeRenderingMode)
+        public override void DrawRectangle(OxyRect rect, OxyColor fill, OxyColor stroke, double thickness, EdgeRenderingMode edgeRenderingMode, double[] dashArray = null)
         {
             this.SetSmoothingMode(this.ShouldUseAntiAliasingForRect(edgeRenderingMode));
             if (fill.IsVisible())

diff --git a/Source/OxyPlot.SkiaSharp/SkiaRenderContext.cs b/Source/OxyPlot.SkiaSharp/SkiaRenderContext.cs
@@ -87,7 +87,7 @@ public void Dispose()
         }
 
         /// <inheritdoc/>
-        public void DrawEllipse(OxyRect extents, OxyColor fill, OxyColor stroke, double thickness, EdgeRenderingMode edgeRenderingMode)
+        public void DrawEllipse(OxyRect extents, OxyColor fill, OxyColor stroke, double thickness, EdgeRenderingMode edgeRenderingMode, double[] dashArray = null)
         {
             if (!fill.IsVisible() && !(stroke.IsVisible() || thickness <= 0))
             {
@@ -110,7 +110,7 @@ public void DrawEllipse(OxyRect extents, OxyColor fill, OxyColor stroke, double
         }
 
         /// <inheritdoc/>
-        public void DrawEllipses(IList<OxyRect> extents, OxyColor fill, OxyColor stroke, double thickness, EdgeRenderingMode edgeRenderingMode)
+        public void DrawEllipses(IList<OxyRect> extents, OxyColor fill, OxyColor stroke, double thickness, EdgeRenderingMode edgeRenderingMode, double[] dashArray = null)
         {
             if (!fill.IsVisible() && (!stroke.IsVisible() || thickness <= 0))
             {
@@ -315,7 +315,7 @@ public void DrawPolygons(
         }
 
         /// <inheritdoc/>
-        public void DrawRectangle(OxyRect rectangle, OxyColor fill, OxyColor stroke, double thickness, EdgeRenderingMode edgeRenderingMode)
+        public void DrawRectangle(OxyRect rectangle, OxyColor fill, OxyColor stroke, double thickness, EdgeRenderingMode edgeRenderingMode, double[] dashArray = null)
         {
             if (!fill.IsVisible() && !(stroke.IsVisible() || thickness <= 0))
             {
@@ -338,7 +338,7 @@ public void DrawRectangle(OxyRect rectangle, OxyColor fill, OxyColor stroke, dou
         }
 
         /// <inheritdoc/>
-        public void DrawRectangles(IList<OxyRect> rectangles, OxyColor fill, OxyColor stroke, double thickness, EdgeRenderingMode edgeRenderingMode)
+        public void DrawRectangles(IList<OxyRect> rectangles, OxyColor fill, OxyColor stroke, double thickness, EdgeRenderingMode edgeRenderingMode, double[] dashArray = null)
         {
             if (!fill.IsVisible() && !(stroke.IsVisible() || thickness <= 0) || rectangles.Count == 0)
             {

diff --git a/Source/OxyPlot.Wpf.Shared/OxyPlot.Wpf.Shared.csproj b/Source/OxyPlot.Wpf.Shared/OxyPlot.Wpf.Shared.csproj
@@ -9,6 +9,7 @@
     <PackageTags>plotting plot charting chart wpf</PackageTags>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>OxyPlot.Wpf.Shared.snk</AssemblyOriginatorKeyFile>
+    <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
   </PropertyGroup>
   <ItemGroup>
     <None Include="OxyPlot.Wpf.Shared.snk" />

diff --git a/Source/OxyPlot.Wpf/CanvasRenderContext.cs b/Source/OxyPlot.Wpf/CanvasRenderContext.cs
@@ -99,21 +99,21 @@ public CanvasRenderContext(Canvas canvas)
         public TextFormattingMode TextFormattingMode { get; set; }
 
         ///<inheritdoc/>
-        public override void DrawEllipse(OxyRect rect, OxyColor fill, OxyColor stroke, double thickness, EdgeRenderingMode edgeRenderingMode)
+        public override void DrawEllipse(OxyRect rect, OxyColor fill, OxyColor stroke, double thickness, EdgeRenderingMode edgeRenderingMode, double[] dashArray = null)
         {
-            this.DrawEllipses(new[] { rect }, fill, stroke, thickness, edgeRenderingMode);
+            this.DrawEllipses(new[] { rect }, fill, stroke, thickness, edgeRenderingMode, dashArray);
         }
 
         ///<inheritdoc/>
-        public override void DrawEllipses(IList<OxyRect> rectangles, OxyColor fill, OxyColor stroke, double thickness, EdgeRenderingMode edgeRenderingMode)
+        public override void DrawEllipses(IList<OxyRect> rectangles, OxyColor fill, OxyColor stroke, double thickness, EdgeRenderingMode edgeRenderingMode, double[] dashArray = null)
         {
             if (rectangles.Count == 0)
             {
                 return;
             }
 
             var path = this.CreateAndAdd<Path>();
-            this.SetStroke(path, stroke, thickness, edgeRenderingMode);
+            this.SetStroke(path, stroke, thickness, edgeRenderingMode, LineJoin.Miter, dashArray);
             if (!fill.IsUndefined())
             {
                 path.Fill = this.GetCachedBrush(fill);
@@ -263,21 +263,21 @@ public override void DrawPolygons(
         }
 
         ///<inheritdoc/>
-        public override void DrawRectangle(OxyRect rect, OxyColor fill, OxyColor stroke, double thickness, EdgeRenderingMode edgeRenderingMode)
+        public override void DrawRectangle(OxyRect rect, OxyColor fill, OxyColor stroke, double thickness, EdgeRenderingMode edgeRenderingMode, double[] dashArray = null)
         {
-            this.DrawRectangles(new[] { rect }, fill, stroke, thickness, edgeRenderingMode);
+            this.DrawRectangles(new[] { rect }, fill, stroke, thickness, edgeRenderingMode, dashArray);
         }
 
         ///<inheritdoc/>
-        public override void DrawRectangles(IList<OxyRect> rectangles, OxyColor fill, OxyColor stroke, double thickness, EdgeRenderingMode edgeRenderingMode)
+        public override void DrawRectangles(IList<OxyRect> rectangles, OxyColor fill, OxyColor stroke, double thickness, EdgeRenderingMode edgeRenderingMode, double[] dashArray = null)
         {
             if (rectangles.Count == 0)
             {
                 return;
             }
 
             var path = this.CreateAndAdd<Path>();
-            this.SetStroke(path, stroke, thickness, edgeRenderingMode);
+            this.SetStroke(path, stroke, thickness, edgeRenderingMode, LineJoin.Miter, dashArray);
             if (!fill.IsUndefined())
             {
                 path.Fill = this.GetCachedBrush(fill);

diff --git a/Source/OxyPlot.Wpf/OxyPlot.Wpf.csproj b/Source/OxyPlot.Wpf/OxyPlot.Wpf.csproj
@@ -10,6 +10,9 @@
     <SignAssembly>True</SignAssembly>
     <Description>OxyPlot is a plotting library for .NET. This package targets WPF applications.</Description>
     <PackageTags>plotting plot charting chart</PackageTags>
+    <RepositoryType>git</RepositoryType>
+    <RepositoryUrl>https://github.com/oxyplot/oxyplot.git</RepositoryUrl>
+    <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
   </PropertyGroup>
   <ItemGroup>
     <None Include="OxyPlot.Wpf.snk" />

diff --git a/Source/OxyPlot.Wpf/XamlRenderContext.cs b/Source/OxyPlot.Wpf/XamlRenderContext.cs
@@ -52,7 +52,7 @@ public XamlRenderContext(Canvas canvas) : base(canvas)
         public double BalancedLineDrawingThicknessLimit { get; set; }
 
         ///<inheritdoc/>
-        public override void DrawEllipses(IList<OxyRect> rectangles, OxyColor fill, OxyColor stroke, double thickness, EdgeRenderingMode edgeRenderingMode)
+        public override void DrawEllipses(IList<OxyRect> rectangles, OxyColor fill, OxyColor stroke, double thickness, EdgeRenderingMode edgeRenderingMode, double[] dashArray = null)
         {
             if (rectangles.Count == 0)
             {
@@ -224,7 +224,7 @@ public override void DrawPolygons(
         }
 
         ///<inheritdoc/>
-        public override void DrawRectangles(IList<OxyRect> rectangles, OxyColor fill, OxyColor stroke, double thickness, EdgeRenderingMode edgeRenderingMode)
+        public override void DrawRectangles(IList<OxyRect> rectangles, OxyColor fill, OxyColor stroke, double thickness, EdgeRenderingMode edgeRenderingMode, double[] dashArray = null)
         {
             if (rectangles.Count == 0)
             {

diff --git a/Source/OxyPlot/Annotations/PointAnnotation.cs b/Source/OxyPlot/Annotations/PointAnnotation.cs
@@ -58,6 +58,17 @@ public PointAnnotation()
         /// <value>The shape.</value>
         public MarkerType Shape { get; set; }
 
+        /// <summary>
+        /// Gets or sets the marker line style. The default is <see cref="OxyPlot.LineStyle.Automatic" />.
+        /// </summary>
+        /// <value>The line style.</value>
+        public LineStyle MarkerLineStyle { get; set; }
+
+        /// <summary>
+        /// Gets the actual dash array for the marker.
+        /// </summary>
+        protected double[]? ActualMarkerDashArray => this.MarkerLineStyle.GetDashArray();
+
         /// <summary>
         /// Gets or sets a custom polygon outline for the point marker. Set <see cref="Shape" /> to <see cref="MarkerType.Custom" /> to use this property.
         /// </summary>
@@ -71,7 +82,7 @@ public override void Render(IRenderContext rc)
 
             this.screenPosition = this.Transform(this.X, this.Y);
 
-            rc.DrawMarker(this.screenPosition, this.Shape, this.CustomOutline, this.Size, this.Fill, this.Stroke, this.StrokeThickness, this.EdgeRenderingMode);
+            rc.DrawMarker(this.screenPosition, this.Shape, this.CustomOutline, this.Size, this.Fill, this.Stroke, this.StrokeThickness, this.EdgeRenderingMode, this.ActualMarkerDashArray);
 
             if (this.Text != null &&
                 !string.IsNullOrEmpty(this.Text))

diff --git a/Source/OxyPlot/OxyPlot.csproj b/Source/OxyPlot/OxyPlot.csproj
@@ -11,6 +11,8 @@
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
         <LangVersion>8</LangVersion>
         <NoWarn>$(NoWarn);CS0618</NoWarn>
+        <NoWarn>618</NoWarn>
+        <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
     </PropertyGroup>
     <ItemGroup>
         <None Include="OxyPlot.snk" />

diff --git a/Source/OxyPlot/Pdf/PdfRenderContext.cs b/Source/OxyPlot/Pdf/PdfRenderContext.cs
@@ -65,7 +65,8 @@ public void Save(Stream s)
         /// <param name="stroke">The stroke color.</param>
         /// <param name="thickness">The thickness.</param>
         /// <param name="edgeRenderingMode">The edge rendering mode. This is not supported and will be ignored.</param>
-        public override void DrawEllipse(OxyRect rect, OxyColor fill, OxyColor stroke, double thickness, EdgeRenderingMode edgeRenderingMode)
+        /// <param name="dashArray">The dash array.</param>
+        public override void DrawEllipse(OxyRect rect, OxyColor fill, OxyColor stroke, double thickness, EdgeRenderingMode edgeRenderingMode, double[] dashArray)
         {
             var isStroked = stroke.IsVisible() && thickness > 0;
             var isFilled = fill.IsVisible();
@@ -208,7 +209,8 @@ public override void DrawPolygon(
         /// <param name="stroke">The stroke color.</param>
         /// <param name="thickness">The stroke thickness.</param>
         /// <param name="edgeRenderingMode">The edge rendering mode. This is not supported and will be ignored.</param>
-        public override void DrawRectangle(OxyRect rect, OxyColor fill, OxyColor stroke, double thickness, EdgeRenderingMode edgeRenderingMode)
+        /// <param name="dashArray">The dash array.</param>
+        public override void DrawRectangle(OxyRect rect, OxyColor fill, OxyColor stroke, double thickness, EdgeRenderingMode edgeRenderingMode, double[] dashArray = null)
         {
             var isStroked = stroke.IsVisible() && thickness > 0;
             var isFilled = fill.IsVisible();

diff --git a/Source/OxyPlot/Rendering/RenderContext/IRenderContext.cs b/Source/OxyPlot/Rendering/RenderContext/IRenderContext.cs
@@ -32,7 +32,8 @@ public interface IRenderContext
         /// <param name="stroke">The stroke color. If set to <c>OxyColors.Undefined</c>, the extents will not be stroked.</param>
         /// <param name="thickness">The thickness (in device independent units, 1/96 inch).</param>
         /// <param name="edgeRenderingMode">The edge rendering mode.</param>
-        void DrawEllipse(OxyRect extents, OxyColor fill, OxyColor stroke, double thickness, EdgeRenderingMode edgeRenderingMode);
+        /// <param name="dashArray"></param>
+        void DrawEllipse(OxyRect extents, OxyColor fill, OxyColor stroke, double thickness, EdgeRenderingMode edgeRenderingMode, double[]? dashArray = null);
 
         /// <summary>
         /// Draws a collection of ellipses, where all have the same stroke and fill.
@@ -42,10 +43,11 @@ public interface IRenderContext
         /// <param name="stroke">The stroke color. If set to <c>OxyColors.Undefined</c>, the ellipses will not be stroked.</param>
         /// <param name="thickness">The stroke thickness (in device independent units, 1/96 inch).</param>
         /// <param name="edgeRenderingMode">The edge rendering mode.</param>
+        /// <param name="dashArray"></param>
         /// <remarks>
         /// This should have better performance than calling <see cref="DrawEllipse" /> multiple times.
         /// </remarks>
-        void DrawEllipses(IList<OxyRect> extents, OxyColor fill, OxyColor stroke, double thickness, EdgeRenderingMode edgeRenderingMode);
+        void DrawEllipses(IList<OxyRect> extents, OxyColor fill, OxyColor stroke, double thickness, EdgeRenderingMode edgeRenderingMode, double[]? dashArray = null);
 
         /// <summary>
         /// Draws a polyline.
@@ -133,7 +135,8 @@ void DrawPolygons(
         /// <param name="stroke">The stroke color. If set to <c>OxyColors.Undefined</c>, the rectangle will not be stroked.</param>
         /// <param name="thickness">The stroke thickness (in device independent units, 1/96 inch).</param>
         /// <param name="edgeRenderingMode">The edge rendering mode.</param>
-        void DrawRectangle(OxyRect rectangle, OxyColor fill, OxyColor stroke, double thickness, EdgeRenderingMode edgeRenderingMode);
+        /// <param name="dashArray"></param>
+        void DrawRectangle(OxyRect rectangle, OxyColor fill, OxyColor stroke, double thickness, EdgeRenderingMode edgeRenderingMode, double[]? dashArray = null);
 
         /// <summary>
         /// Draws a collection of extents, where all have the same stroke and fill.
@@ -143,10 +146,11 @@ void DrawPolygons(
         /// <param name="stroke">The stroke color. If set to <c>OxyColors.Undefined</c>, the extents will not be stroked.</param>
         /// <param name="thickness">The stroke thickness (in device independent units, 1/96 inch).</param>
         /// <param name="edgeRenderingMode">The edge rendering mode.</param>
+        /// <param name="dashArray"></param>
         /// <remarks>
         /// This should have better performance than calling <see cref="DrawRectangle" /> multiple times.
         /// </remarks>
-        void DrawRectangles(IList<OxyRect> rectangles, OxyColor fill, OxyColor stroke, double thickness, EdgeRenderingMode edgeRenderingMode);
+        void DrawRectangles(IList<OxyRect> rectangles, OxyColor fill, OxyColor stroke, double thickness, EdgeRenderingMode edgeRenderingMode, double[]? dashArray = null);
 
         /// <summary>
         /// Draws text.

diff --git a/Source/OxyPlot/Rendering/RenderContext/RenderContextBase.cs b/Source/OxyPlot/Rendering/RenderContext/RenderContextBase.cs
@@ -67,18 +67,18 @@ public static bool IsStraightLine(IList<ScreenPoint> points)
         public bool RendersToScreen { get; set; }
 
         /// <inheritdoc/>
-        public virtual void DrawEllipse(OxyRect rect, OxyColor fill, OxyColor stroke, double thickness, EdgeRenderingMode edgeRenderingMode)
+        public virtual void DrawEllipse(OxyRect rect, OxyColor fill, OxyColor stroke, double thickness, EdgeRenderingMode edgeRenderingMode, double[] dashArray)
         {
             var polygon = CreateEllipse(rect);
             this.DrawPolygon(polygon, fill, stroke, thickness, edgeRenderingMode, null, LineJoin.Miter);
         }
 
         /// <inheritdoc/>
-        public virtual void DrawEllipses(IList<OxyRect> rectangles, OxyColor fill, OxyColor stroke, double thickness, EdgeRenderingMode edgeRenderingMode)
+        public virtual void DrawEllipses(IList<OxyRect> rectangles, OxyColor fill, OxyColor stroke, double thickness, EdgeRenderingMode edgeRenderingMode, double[] dashArray)
         {
             foreach (var r in rectangles)
             {
-                this.DrawEllipse(r, fill, stroke, thickness, edgeRenderingMode);
+                this.DrawEllipse(r, fill, stroke, thickness, edgeRenderingMode, dashArray);
             }
         }
 
@@ -133,18 +133,18 @@ public virtual void DrawPolygons(
         }
 
         /// <inheritdoc/>
-        public virtual void DrawRectangle(OxyRect rect, OxyColor fill, OxyColor stroke, double thickness, EdgeRenderingMode edgeRenderingMode)
+        public virtual void DrawRectangle(OxyRect rect, OxyColor fill, OxyColor stroke, double thickness, EdgeRenderingMode edgeRenderingMode, double[] dashArray = null)
         {
             var polygon = CreateRectangle(rect);
-            this.DrawPolygon(polygon, fill, stroke, thickness, edgeRenderingMode, null, LineJoin.Miter);
+            this.DrawPolygon(polygon, fill, stroke, thickness, edgeRenderingMode, dashArray, LineJoin.Miter);
         }
 
         /// <inheritdoc/>
-        public virtual void DrawRectangles(IList<OxyRect> rectangles, OxyColor fill, OxyColor stroke, double thickness, EdgeRenderingMode edgeRenderingMode)
+        public virtual void DrawRectangles(IList<OxyRect> rectangles, OxyColor fill, OxyColor stroke, double thickness, EdgeRenderingMode edgeRenderingMode, double[] dashArray = null)
         {
             foreach (var r in rectangles)
             {
-                this.DrawRectangle(r, fill, stroke, thickness, edgeRenderingMode);
+                this.DrawRectangle(r, fill, stroke, thickness, edgeRenderingMode, dashArray);
             }
         }