Merge branch 'master' into test

.github/workflows/runtests.yml

@@ -11,7 +11,7 @@ jobs:
       matrix:
         os: [windows-latest]
         # os: [windows-latest, ubuntu-latest]
-        framework: [netcoreapp2.1, netcoreapp3.1, net5.0, net452, net461]
+        framework: [netcoreapp3.1, net6.0, net462]
     steps:
       - name: Checkout source
         uses: actions/checkout@v2
@@ -25,6 +25,11 @@ jobs:
         with:
           path: ~/.nuget/packages
           key: ${{ runner.os }}-nuget }}
+      - name: Setup .NET 3.1 SDK
+        uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: 3.1.x
+          include-prerelease: false
       - name: Restore NuGet Packages
         if: steps.cache.outputs.cache-hit != 'true'
         run: |
@@ -58,6 +63,11 @@ jobs:
         with:
           path: ~/.nuget/packages
           key: ${{ runner.os }}-nuget-bench }}
+      - name: Setup .NET 3.1 SDK
+        uses: actions/setup-dotnet@v3
+        with:
+          dotnet-version: 3.1.x
+          include-prerelease: false
       - name: Restore NuGet Packages
         if: steps.cache.outputs.cache-hit != 'true'
         run: |

.gitignore

@@ -355,3 +355,9 @@ MigrationBackup/
 # JetBrains Rider
 .idea/
 *.sln.iml
+
+# W3C Test Suites
+Tests/W3CTestSuite/images
+Tests/W3CTestSuite/png
+Tests/W3CTestSuite/resources
+Tests/W3CTestSuite/svg

Generators/AvailableElementsGenerator.cs

@@ -305,7 +305,9 @@ static int ElementNameComparison(Element x, Element y)
 
             // Group all properties by element type.
             var elementProperties = items.SelectMany(x => x.Value.Properties).Distinct(new PropertyEqualityComparer());
-            var elementPropertiesDict = elementProperties.GroupBy(x => x.Symbol.ContainingType).ToDictionary(x => x.Key, y => y.ToList());
+            var elementPropertiesDict = elementProperties
+                .GroupBy(x => x.Symbol.ContainingType, SymbolEqualityComparer.Default)
+                .ToDictionary(x => x.Key, y => y.ToList(), SymbolEqualityComparer.Default);
 
             // Generate SvgElement base class with Properties dictionary.
 

Generators/Svg.Generators.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
@@ -7,11 +7,12 @@
     <AnalysisLevel>latest</AnalysisLevel>
     <Nullable>enable</Nullable>
     <LangVersion>latest</LangVersion>
+    <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="3.8.0" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.2" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.4.0" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" PrivateAssets="all" />
   </ItemGroup>
 
 </Project>

README.md

@@ -1,21 +1,22 @@
 ![W3C SVG Logo](https://www.w3.org/Icons/SVG/svg-logo-v.png)
 # SVG.NET[![NuGet version](https://badge.fury.io/nu/svg.svg)](https://badge.fury.io/nu/svg) [![Gitter](https://badges.gitter.im/vvvv/SVG.svg)](https://gitter.im/vvvv/SVG?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) ![Testsuite](https://github.com/svg-net/SVG/workflows/Testsuite/badge.svg?branch=master) ![DocBuild](https://github.com/svg-net/SVG/workflows/DocBuild/badge.svg?branch=master)
 
-Public fork of the C# SVG rendering library on codeplex: https://svg.codeplex.com/
+Public fork of the C# SVG rendering library on codeplex. 
 
 This started out as a minor modification to enable the writing of proper SVG strings. But now after almost two years we have so many fixes and improvements that we decided to share our current codebase to the public in order to improve it even further.
 
 So please feel free to fork it and open pull requests for any fix, improvement or feature you add. 
 You may check the [contributing guide](https://github.com/svg-net/SVG/blob/master/CONTRIBUTING.md) for more information on how to do this. 
 
-For information on installation and usage of the library, and for release notes please check the [documentation pages](http://svg-net.github.io/SVG/).
+For information on installation and usage of the library, and for release notes please check the [documentation pages](https://svg-net.github.io/SVG/).
 
 ## Projects using the library
 
-* [vvvv](http://vvvv.org) a hybrid visual/textual live-programming environment for easy prototyping and development.
+* [vvvv](https://vvvv.org) a hybrid visual/textual live-programming environment for easy prototyping and development.
 * [Posh](https://github.com/vvvv/Posh) a windowing/interaction/drawing layer for C#/.NET desktop applications with their GUI in a browser. 
 * [Timeliner](https://github.com/vvvv/Timeliner) a Posh based timeline that can be controlled by and sends out its values via OSC.
-* [Chordious](http://chordious.com) a fretboard diagram generator for fretted stringed instruments.
+* [Chordious](https://chordious.com) a fretboard diagram generator for fretted stringed instruments.
+* [HttpMaster](https://www.httpmaster.net) a Windows tool for HTTP testing and debugging.
 
 If you want your project in this list, send me a pull request on this file or link + short description to tebjan (at) vvvv.org
 
@@ -26,5 +27,4 @@ This project has dependencies on other open-source projects. These projects are
 
 |Project|Author|Sources|License|
 |--------|-----|---|---------|
-|Fizzler|Atif Aziz (@atifaziz)|[GitHub](https://github.com/atifaziz/Fizzler)|[LGPL](https://github.com/atifaziz/Fizzler/blob/master/COPYING.LESSER.txt)|
 |ExCSS|Tyler Brinks (@tylerbrinks)|[GitHub](https://github.com/TylerBrinks/ExCSS)|[MIT](https://github.com/TylerBrinks/ExCSS/blob/master/license.txt)|

Samples/Entities/Entities.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net461;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;net462</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>

Samples/XMLOutput/Program.cs → Samples/SVGBuilder/Program.cs

@@ -1,19 +1,19 @@
-using System;
-using System.Windows.Forms;
-
-namespace XMLOutputTester
-{
-    static class Program
-    {
-        /// <summary>
-        /// The main entry point for the application.
-        /// </summary>
-        [STAThread]
-        static void Main()
-        {
-            Application.EnableVisualStyles();
-            Application.SetCompatibleTextRenderingDefault(false);
-            Application.Run(new Form1());
-        }
-    }
-}
+using System;
+using System.Windows.Forms;
+
+namespace SVGBuilder
+{
+    static class Program
+    {
+        /// <summary>
+        /// The main entry point for the application.
+        /// </summary>
+        [STAThread]
+        static void Main()
+        {
+            Application.EnableVisualStyles();
+            Application.SetCompatibleTextRenderingDefault(false);
+            Application.Run(new SvgBuilder());
+        }
+    }
+}

Samples/XMLOutput/Properties/AssemblyInfo.cs → Samples/SVGBuilder/Properties/AssemblyInfo.cs

@@ -1,36 +1,36 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("XMLOutputTester")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Microsoft")]
-[assembly: AssemblyProduct("XMLOutputTester")]
-[assembly: AssemblyCopyright("Copyright © Microsoft 2011")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("97db38e0-08e8-45c0-a4e3-b497681dcc34")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("SVGBuilder")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("SVGBuilder")]
+[assembly: AssemblyCopyright("Copyright © Microsoft 2011")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("97db38e0-08e8-45c0-a4e3-b497681dcc34")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers 
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]