v3.4.0 - Drops building for .NET 6.0 which is beyond End of Support

Author: monoman

.editorconfig

@@ -156,7 +156,7 @@ dotnet_style_prefer_inferred_tuple_names = true:suggestion
 dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
 dotnet_style_prefer_compound_assignment = true:suggestion
 dotnet_style_prefer_simplified_interpolation = true:suggestion
-dotnet_style_namespace_match_folder = true:suggestion
+dotnet_style_namespace_match_folder = true:none
 dotnet_style_readonly_field = true:suggestion
 dotnet_style_require_accessibility_modifiers = for_non_interface_members:suggestion
 dotnet_style_allow_statement_immediately_after_block_experimental = true:suggestion
@@ -172,3 +172,6 @@ dotnet_style_qualification_for_event = false:silent
 dotnet_diagnostic.CA1712.severity = warning
 dotnet_diagnostic.CA1725.severity = suggestion
 dotnet_diagnostic.CA2011.severity = warning
+
+# IDE0130: Namespace does not match folder structure
+dotnet_diagnostic.IDE0130.severity = none

README.md

@@ -4,7 +4,7 @@ A fork of the SvgNet & SvgGdi bridge (http://www.codeproject.com/KB/cs/svgnet.as
 
 __SvgNet is now available as a Nuget:__ [SvgNet](https://www.nuget.org/packages/SvgNet/).
 
-__Latest version 3.3.9 is .NET Standard 2.0 and 2.1 and also .NET 6.0/8.0 (base and Windows) compatible and works with .NET Core 2.x and 3.x and .NET 5.0/6.0/7.0/8.0, but now requires .NET Framework 4.6.2 or higher__
+__Latest version 3.4.0 is .NET Standard 2.0 and 2.1 and also .NET 8.0 (base and Windows) compatible and works with .NET Core 2.x and 3.x and .NET 5.0/6.0/7.0/8.0, but now requires .NET Framework 4.6.2 or higher__
 
 To build this version properly you need .NET 8.0.403+ SDK installed
 

SvgNet/SvgNet.csproj

@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net8.0</TargetFrameworks>
-		<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net462;net6.0-windows;net8.0-windows</TargetFrameworks>
-		<UseWindowsForms Condition="'$(TargetFramework)' == 'net6.0-windows' or '$(TargetFramework)' == 'net8.0-windows'">true</UseWindowsForms>
+		<TargetFrameworks>netstandard2.0;netstandard2.1;net8.0</TargetFrameworks>
+		<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net462;net8.0-windows</TargetFrameworks>
+		<UseWindowsForms Condition="'$(TargetFramework)' == 'net8.0-windows'">true</UseWindowsForms>
 		<LangVersion>preview</LangVersion>
 		<AssemblyName>SVG</AssemblyName>
 		<PackageId>SvgNet</PackageId>
-		<Version>3.3.9</Version>
+		<Version>3.4.0</Version>
 		<RootNamespace>SvgNet</RootNamespace>
 		<DocumentationFile>svgnetdoc.xml</DocumentationFile>
 		<NoWarn>CS1591</NoWarn>
@@ -23,7 +23,7 @@
 		<Product>SvgNet</Product>
 		<RepositoryType>git</RepositoryType>
 		<PackageReleaseNotes>
-			- Fixes issue #47 - Metafile parsing hack still may err but it is only tried when lines have custom line caps now, what may not be that common
+			- Drops building for .NET 6.0 which is beyond End of Support
 		</PackageReleaseNotes>
 		<PackageLicenseFile>LICENSE</PackageLicenseFile>
 		<PackageReadmeFile>README.md</PackageReadmeFile>
@@ -73,7 +73,7 @@
 		<Message Importance="high" Text="Didn't push $(LatestPackage) to Nuget - Already there" Condition="$(VersionAlreadyPushed)" />
 	</Target>
 
-	<ItemGroup Condition="'$(TargetFramework)' != 'net462' And '$(TargetFramework)' != 'net8.0-windows' And '$(TargetFramework)' != 'net6.0-windows'">
+	<ItemGroup Condition="'$(TargetFramework)' != 'net462' And '$(TargetFramework)' != 'net8.0-windows'">
 		<PackageReference Include="System.Drawing.Common" />
 	</ItemGroup>
 

SvgNetUnitTests/SvgColorTests.cs

@@ -30,11 +30,13 @@ public class SvgColorTests {
     public void TestSvgColor_FromString(string colorAsString, int a, int r, int g, int b) {
         var color = new SvgColor(colorAsString);
         Assert.That(color, Is.Not.Null);
-        Assert.That(color.ToString(), Is.EqualTo(colorAsString));
-        Assert.That(a, Is.EqualTo(color.Color.A), "alpha");
-        Assert.That(r, Is.EqualTo(color.Color.R), "red");
-        Assert.That(g, Is.EqualTo(color.Color.G), "green");
-        Assert.That(b, Is.EqualTo(color.Color.B), "blue");
+        Assert.Multiple(() => {
+            Assert.That(color.ToString(), Is.EqualTo(colorAsString));
+            Assert.That(a, Is.EqualTo(color.Color.A), "alpha");
+            Assert.That(r, Is.EqualTo(color.Color.R), "red");
+            Assert.That(g, Is.EqualTo(color.Color.G), "green");
+            Assert.That(b, Is.EqualTo(color.Color.B), "blue");
+        });
     }
 
     [TestCase("blackPearl")]

SvgNetUnitTests/SvgNetUnitTests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<LangVersion>preview</LangVersion>
-		<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+		<TargetFrameworks>net8.0</TargetFrameworks>
 		<RootNamespace>SvgNet</RootNamespace>
 	</PropertyGroup>