v2.2.0 - Support for .NET 6 (requires .NET 6 SDK for build)

Author: monoman

SvgNet/.editorconfig renamed to .editorconfig

@@ -1,5 +1,11 @@
 [*]
-end_of_line = crlf
+end_of_line =lf
+indent_style=tab
+dotnet_style_predefined_type_for_locals_parameters_members=true:error
+dotnet_style_predefined_type_for_member_access=true:warning
+dotnet_diagnostic.CA1021.severity=silent
+dotnet_diagnostic.CA1310.severity=suggestion
+dotnet_style_allow_multiple_blank_lines_experimental=false:silent
 
 [*.xml]
 indent_style = space
@@ -12,7 +18,7 @@ dotnet_sort_system_directives_first=true
 csharp_new_line_before_else=false
 csharp_new_line_before_catch=false
 csharp_new_line_before_finally=false
-csharp_prefer_braces=false:silent
+csharp_prefer_braces=false:suggestion
 csharp_prefer_simple_default_expression=true:suggestion
 csharp_new_line_before_open_brace=none
 csharp_style_expression_bodied_accessors=true:silent
@@ -25,4 +31,7 @@ csharp_style_var_when_type_is_apparent=true:silent
 csharp_style_deconstructed_variable_declaration=true:suggestion
 
 # IDE0056: Use index operator
-csharp_style_prefer_index_operator = true:none
+csharp_style_prefer_index_operator =false:suggestion
+csharp_style_namespace_declarations=block_scoped:warning
+csharp_style_prefer_pattern_matching=true:suggestion
+csharp_style_allow_blank_lines_between_consecutive_braces_experimental=false:silent

.github/workflows/dotnetcore.yml

@@ -10,10 +10,10 @@ jobs:
     steps:
     - uses: actions/checkout@v1
 
-    - name: Setup .NET 5.0
+    - name: Setup .NET 6.0
       uses: actions/[email protected]
       with:
-        dotnet-version: 5.0.202
+        dotnet-version: 6.0.100
 
     - name: Build and Test with dotnet
       run: NONET461=true dotnet test --configuration Release -v:m | grep -v 'NAME_UNKNOWN:Package'

SvgDocTest/Assert.cs

@@ -8,22 +8,16 @@
 
 using System;
 
-namespace SvgDocTest
-{
-    public static class Assert
-    {
-        public static void Equals(float a, float b)
-        {
-            if (a != b)
-            {
+namespace SvgDocTest {
+    public static class Assert {
+        public static void Equals(float a, float b) {
+            if (a != b) {
                 throw new Exception("Assert.Equals");
             }
         }
 
-        public static void Equals(bool a, bool b)
-        {
-            if (a != b)
-            {
+        public static void Equals(bool a, bool b) {
+            if (a != b) {
                 throw new Exception("Assert.Equals");
             }
         }

SvgDocTest/DocForm.Designer.cs

@@ -0,0 +1,142 @@
+using System;
+using System.IO;
+using System.Windows.Forms;
+using SvgNet;
+using SvgNet.SvgElements;
+using SvgNet.SvgTypes;
+
+namespace SvgDocTest {
+    public partial class DocForm : Form {
+        public DocForm() => InitializeComponent();
+
+        private static readonly string _tempFileName = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "foo.svg");
+
+
+        /// <summary>
+        /// The main entry point for the application.
+        /// </summary>
+        [STAThread]
+        private static void Main() => Application.Run(new DocForm());
+
+        private static void RefreshBrowserFrom(WebBrowser browser, string filename) {
+            browser.Navigate(new Uri(filename));
+            browser.Refresh(WebBrowserRefreshOption.Completely);
+        }
+
+        private void Button1_Click(object sender, EventArgs e) {
+            using (var dlg = new OpenFileDialog {
+                AutoUpgradeEnabled = true,
+                CheckFileExists = true,
+                DefaultExt = ".svg",
+                Filter = "Scalable Vector Graphics|*.svg",
+                Multiselect = false,
+                Title = "Choose one Scalable Vector Graphics file"
+            }) {
+                if (dlg.ShowDialog() == DialogResult.OK) {
+                    ProcessSvgFile(dlg.FileName);
+                }
+            }
+        }
+
+        private void Button2_Click(object sender, EventArgs e) {
+            var root = new SvgSvgElement("4in", "4in", "-10,-10 250,250");
+
+            //adding multiple children
+
+            root.AddChildren(
+                new SvgRectElement(5, 5, 5, 5),
+                new SvgEllipseElement(20, 20, 8, 12) {
+                    Style = "fill:yellow;stroke:red"
+                },
+
+                new SvgAElement("https://github.com/managed-commons/SvgNet").AddChildren(
+                    new SvgTextElement("Textastic!", 30, 20) {
+                        Style = "fill:midnightblue;stroke:navy;stroke-width:1px;font-size:30px;font-family:Calibri"
+                    })
+                );
+
+            //group and path
+
+            var grp = new SvgGroupElement("green_group") {
+                Style = "fill:green;stroke:black;"
+            };
+
+            grp.AddChild(new SvgRectElement(30, 30, 5, 20));
+
+            var ell = new SvgEllipseElement {
+                CX = 50,
+                CY = 50,
+                RX = 10,
+                RY = 20
+            };
+
+            var pathy = new SvgPathElement {
+                D = "M 20,80 C 20,90 30,80 70,100 C 70,100 40,60 50,60 z",
+                Style = ell.Style
+            };
+
+            root.AddChild(grp);
+
+            //cloning and style arithmetic
+
+            grp.AddChildren(ell, pathy);
+
+            grp.Style.Set("fill", "blue");
+
+            var grp2 = (SvgGroupElement)SvgFactory.CloneElement(grp);
+
+            grp2.Id = "cloned_red_group";
+
+            grp2.Style.Set("fill", "red");
+
+            grp2.Style += "opacity:0.5";
+
+            grp2.Transform = "scale (1.2, 1.2)  translate(10)";
+
+            root.AddChild(grp2);
+
+            //output
+
+            string s = root.WriteSVGString(true);
+
+            tbOut.Text = s;
+
+            string tempFile = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "foo.svg");
+
+            using (var tw = new StreamWriter(tempFile, false))
+                tw.Write(s);
+
+            svgOut.Navigate(new Uri(tempFile));
+            svgOut.Refresh(WebBrowserRefreshOption.Completely);
+        }
+
+        private void Button3_Click(object sender, EventArgs e) {
+            SvgNumList a = "3, 5.6 901		-7  ";
+            Assert.Equals(a[3], -7f);
+
+            SvgTransformList b = "rotate ( 45 ), translate (11, 10)skewX(3)";
+            Assert.Equals(b[1].Matrix.OffsetX, 11f);
+
+            SvgColor c = "rgb( 100%, 100%, 50%)";
+            Assert.Equals(c.Color.B, 0x7f);
+
+            SvgColor d = "#abc";
+            Assert.Equals(d.Color.G, 0xbb);
+
+            SvgPath f = "M 5,5 L 1.1 -6    , Q 1,3 9,10  z";
+            Assert.Equals(f.Count, 4f);
+            Assert.Equals(f[1].Abs, true);
+            Assert.Equals(f[2].Data[3], 10f);
+
+            MessageBox.Show("Tests completed Ok");
+        }
+        private void ProcessSvgFile(string svgFileName) {
+            tbIn.Text = svgFileName.LoadText();
+            RefreshBrowserFrom(svgIn, svgFileName);
+            tbOut.Text = SvgFactory.LoadFromXML(svgFileName.LoadXml(), null).WriteSVGString(true);
+            File.WriteAllText(_tempFileName, tbOut.Text);
+            RefreshBrowserFrom(svgOut, _tempFileName);
+        }
+
+    }
+}