Added support for .NET 8 (#1137)

* Added support for .NET 8 - Updated test and sample projects to supports .NET 8 - Fixed compile warnings and errors including CS8352, CA1416 - Initial update to the tests workflow (runtests.yml) - Removed previously deleted items from the solution file. * Fixing workflow errors and warnings - Added .NET 3.1 - Removed include-prerelease: false - Upgraded actions/cache to v4 (from v1) * Update runtests.yml - Run tests in release mode (as the benchmark) - Upgraded the actions/checkout (v2 to v4) * Add test solutions to reduce unnecessary nuget package restore - nuget restore is currently the longest running work on the workflow. - initial attempt to improve it * Removed CS0618 in debug mode, updated release notes.
svg-net · Feb 3, 2024 · 02518c4 · 02518c4
1 parent 030ac29
commit 02518c4
Show file tree

Hide file tree

Showing 31 changed files with 284 additions and 112 deletions.
diff --git a/.github/workflows/runtests.yml b/.github/workflows/runtests.yml
@@ -1,7 +1,11 @@
 name: Testsuite
 
 on:
-  [push, pull_request]
+  workflow_dispatch: # Allows manual triggering of workflow
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
 
 jobs:
   test:
@@ -11,36 +15,37 @@ jobs:
       matrix:
         os: [windows-latest]
         # os: [windows-latest, ubuntu-latest]
-        framework: [netcoreapp3.1, net6.0, net462]
+        framework: [net8.0, net6.0, netcoreapp3.1, net462]
     steps:
       - name: Checkout source
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0  # needed for GitVersioning to work
       - name: Setup NuGet
         uses: NuGet/setup-nuget@v1
       - name: Cache NuGet packages
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         id: cache
         with:
           path: ~/.nuget/packages
           key: ${{ runner.os }}-nuget }}
-      - name: Setup .NET 3.1 SDK
-        uses: actions/setup-dotnet@v3
+      - name: Setup .NET 3.1/8.0 SDK
+        uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 3.1.x
-          include-prerelease: false
+          dotnet-version: |
+            3.1.x
+            8.0.x
       - name: Restore NuGet Packages
         if: steps.cache.outputs.cache-hit != 'true'
         run: |
-          nuget restore Source/Svg.sln
-          nuget install NUnit.ConsoleRunner -Version 3.10.0 -OutputDirectory tools
+          nuget restore Tests/Svg.UnitTests.sln
+          nuget install NUnit.ConsoleRunner -Version 3.17.0 -OutputDirectory tools
       - name: Run tests
         env:
           DOTNET_NOLOGO: true
           DOTNET_CLI_TELEMETRY_OPTOUT: true
         run: |
-          dotnet test --framework ${{ matrix.framework }} Tests/Svg.UnitTests/Svg.UnitTests.csproj
+          dotnet test -c Release -f ${{ matrix.framework }} Tests/Svg.UnitTests/Svg.UnitTests.csproj
           
   benchmark:
     runs-on: ${{ matrix.os }}
@@ -49,29 +54,28 @@ jobs:
         benchmark: [SvgDocument, SvgPathBuilder, SvgTransformConverter, CoordinateParser]
         os: [windows-latest]
         # os: [windows-latest, ubuntu-latest]
-        framework: [netcoreapp3.1]
+        framework: [net8.0]
     steps:
       - name: Checkout source
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Setup NuGet
         uses: NuGet/setup-nuget@v1
       - name: Cache NuGet packages
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         id: cache
         with:
           path: ~/.nuget/packages
           key: ${{ runner.os }}-nuget-bench }}
-      - name: Setup .NET 3.1 SDK
-        uses: actions/setup-dotnet@v3
+      - name: Setup .NET 8.x SDK
+        uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 3.1.x
-          include-prerelease: false
+          dotnet-version: 8.0.x
       - name: Restore NuGet Packages
         if: steps.cache.outputs.cache-hit != 'true'
         run: |
-          nuget restore Source/Svg.sln
+          nuget restore Tests/Svg.Benchmark.sln
       - name: Run benchmarks
         env:
           DOTNET_NOLOGO: true

diff --git a/Generators/Svg.Generators.csproj b/Generators/Svg.Generators.csproj
@@ -8,6 +8,14 @@
         <Nullable>enable</Nullable>
         <LangVersion>latest</LangVersion>
         <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
+        <Configurations>Debug;Release</Configurations>
+    </PropertyGroup>
+
+    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    </PropertyGroup>
+
+    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+        <NoWarn>$(NoWarn);CS1591;CS0618</NoWarn>
     </PropertyGroup>
 
     <ItemGroup>

diff --git a/Samples/Entities/Entities.csproj b/Samples/Entities/Entities.csproj
@@ -3,10 +3,11 @@
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <TargetFrameworks>netcoreapp3.1;net462</TargetFrameworks>
+        <Configurations>Debug;Release</Configurations>
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-        <NoWarn>$(NoWarn);CS0618;NETSDK1138</NoWarn>
+        <NoWarn>$(NoWarn);NETSDK1138</NoWarn>
     </PropertyGroup>
     <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
         <NoWarn>$(NoWarn);CS1591;CS0618;NETSDK1138</NoWarn>

diff --git a/Samples/SVGBuilder/Properties/AssemblyInfo.cs b/Samples/SVGBuilder/Properties/AssemblyInfo.cs
@@ -34,3 +34,6 @@
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
+#if NET5_0_OR_GREATER
+[assembly: System.Runtime.Versioning.SupportedOSPlatform("windows7.0")]
+#endif
diff --git a/Samples/SVGBuilder/SVGBuilder.csproj b/Samples/SVGBuilder/SVGBuilder.csproj
@@ -2,14 +2,15 @@
 
     <PropertyGroup>
         <OutputType>WinExe</OutputType>
-        <TargetFrameworks>net6.0-windows;net462</TargetFrameworks>
+        <TargetFrameworks>net8.0-windows;net6.0-windows;net462</TargetFrameworks>
         <UseWindowsForms>true</UseWindowsForms>
         <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
         <GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
+        <Configurations>Debug;Release</Configurations>
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-        <NoWarn>$(NoWarn);CS0618;NETSDK1138</NoWarn>
+        <NoWarn>$(NoWarn);NETSDK1138</NoWarn>
     </PropertyGroup>
     <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
         <NoWarn>$(NoWarn);CS1591;CS0618;NETSDK1138</NoWarn>

diff --git a/Samples/SVGViewer/Properties/AssemblyInfo.cs b/Samples/SVGViewer/Properties/AssemblyInfo.cs
@@ -34,3 +34,6 @@
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
 [assembly: AssemblyFileVersion("1.0.0.0")]
+#if NET5_0_OR_GREATER
+[assembly: System.Runtime.Versioning.SupportedOSPlatform("windows7.0")]
+#endif
diff --git a/Samples/SVGViewer/SVGViewer.csproj b/Samples/SVGViewer/SVGViewer.csproj
@@ -2,14 +2,15 @@
 
     <PropertyGroup>
         <OutputType>WinExe</OutputType>
-        <TargetFrameworks>net6.0-windows;net462</TargetFrameworks>
+        <TargetFrameworks>net8.0-windows;net6.0-windows;net462</TargetFrameworks>
         <UseWindowsForms>true</UseWindowsForms>
         <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
         <GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
+        <Configurations>Debug;Release</Configurations>
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-        <NoWarn>$(NoWarn);CS0618;NETSDK1138</NoWarn>
+        <NoWarn>$(NoWarn);NETSDK1138</NoWarn>
     </PropertyGroup>
     <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
         <NoWarn>$(NoWarn);CS1591;CS0618;NETSDK1138</NoWarn>

diff --git a/Samples/SvgConsole/SvgConsole.csproj b/Samples/SvgConsole/SvgConsole.csproj
@@ -8,15 +8,13 @@
         <PackAsTool>True</PackAsTool>
         <ToolCommandName>SvgConsole</ToolCommandName>
         <LangVersion>7.3</LangVersion>
-    </PropertyGroup>
-
-    <PropertyGroup>
+        <Configurations>Debug;Release</Configurations>
         <PublishTrimmed>False</PublishTrimmed>
         <PublishReadyToRun>False</PublishReadyToRun>
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-        <NoWarn>$(NoWarn);CS0618;NETSDK1138</NoWarn>
+        <NoWarn>$(NoWarn);NETSDK1138</NoWarn>
     </PropertyGroup>
     <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
         <NoWarn>$(NoWarn);CS1591;CS0618;NETSDK1138</NoWarn>

diff --git a/Samples/SvgRuntimeUpdates/SvgRuntimeUpdates.csproj b/Samples/SvgRuntimeUpdates/SvgRuntimeUpdates.csproj
@@ -3,10 +3,11 @@
     <PropertyGroup>
         <OutputType>Exe</OutputType>
         <TargetFrameworks>netcoreapp3.1;net462</TargetFrameworks>
+        <Configurations>Debug;Release</Configurations>
     </PropertyGroup>
 
     <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-        <NoWarn>$(NoWarn);CS0618;NETSDK1138</NoWarn>
+        <NoWarn>$(NoWarn);NETSDK1138</NoWarn>
     </PropertyGroup>
     <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
         <NoWarn>$(NoWarn);CS1591;CS0618;NETSDK1138</NoWarn>

diff --git a/Source/DataTypes/SvgNumberCollection.cs b/Source/DataTypes/SvgNumberCollection.cs
@@ -64,7 +64,7 @@ public static SvgNumberCollection Parse(ReadOnlySpan<char> numbers)
             foreach (var part in parts)
             {
                 var partValue = part.Value;
-                var result = StringParser.ToFloatAny(ref partValue);
+                var result = StringParser.ToFloatAny(partValue);
                 collection.Add(result);
             }
 

diff --git a/Source/DataTypes/SvgPointCollection.cs b/Source/DataTypes/SvgPointCollection.cs
@@ -63,7 +63,7 @@ public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo c
                 var coords = s.AsSpan().Trim();
                 var state = new CoordinateParserState(ref coords);
                 var result = new SvgPointCollection();
-                while (CoordinateParser.TryGetFloat(out var pointValue, ref coords, ref state))
+                while (CoordinateParser.TryGetFloat(out var pointValue, coords, ref state))
                 {
                     result.Add(new SvgUnit(SvgUnitType.User, pointValue));
                 }

diff --git a/Source/DataTypes/SvgUnitConverter.cs b/Source/DataTypes/SvgUnitConverter.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.ComponentModel;
 using System.Globalization;
 using Svg.Helpers;
@@ -81,7 +81,7 @@ public static SvgUnit Parse(ReadOnlySpan<char> unit)
             }
 
             var valSpan = identifierIndex > -1 ? unit.Slice(0, identifierIndex) : unit;
-            var val = StringParser.ToFloat(ref valSpan);
+            var val = StringParser.ToFloat(valSpan);
             if (identifierIndex == -1)
             {
                 return new SvgUnit(val);

diff --git a/Source/Exceptions/SvgException.cs b/Source/Exceptions/SvgException.cs
@@ -1,5 +1,7 @@
 using System;
+#if !NET8_0_OR_GREATER
 using System.Runtime.Serialization;
+#endif
 
 namespace Svg
 {
@@ -10,8 +12,10 @@ public class SvgException : FormatException
         public SvgException(string message) : base(message) { }
         public SvgException(string message, Exception inner) : base(message, inner) { }
 
+#if !NET8_0_OR_GREATER
         protected SvgException(SerializationInfo info, StreamingContext context)
             : base (info, context) { }
+#endif
     }
 
     [Serializable]
@@ -21,8 +25,10 @@ public class SvgIDException : FormatException
         public SvgIDException(string message) : base(message) { }
         public SvgIDException(string message, Exception inner) : base(message, inner) { }
 
+#if !NET8_0_OR_GREATER
         protected SvgIDException(SerializationInfo info, StreamingContext context)
             : base(info, context) { }
+#endif
     }
 
     [Serializable]
@@ -32,8 +38,10 @@ public class SvgIDExistsException : SvgIDException
         public SvgIDExistsException(string message) : base(message) { }
         public SvgIDExistsException(string message, Exception inner) : base(message, inner) { }
 
+#if !NET8_0_OR_GREATER
         protected SvgIDExistsException(SerializationInfo info, StreamingContext context)
             : base(info, context) { }
+#endif
     }
 
     [Serializable]
@@ -43,7 +51,9 @@ public class SvgIDWrongFormatException : SvgIDException
         public SvgIDWrongFormatException(string message) : base(message) { }
         public SvgIDWrongFormatException(string message, Exception inner) : base(message, inner) { }
 
+#if !NET8_0_OR_GREATER
         protected SvgIDWrongFormatException(SerializationInfo info, StreamingContext context)
             : base(info, context) { }
+#endif
     }
 }
diff --git a/Source/Exceptions/SvgGdiPlusCannotBeLoadedException.cs b/Source/Exceptions/SvgGdiPlusCannotBeLoadedException.cs
@@ -1,5 +1,7 @@
 using System;
+#if !NET8_0_OR_GREATER
 using System.Runtime.Serialization;
+#endif
 
 namespace Svg
 {
@@ -13,7 +15,9 @@ public class SvgGdiPlusCannotBeLoadedException : Exception
         public SvgGdiPlusCannotBeLoadedException(Exception inner) : base(gdiErrorMsg, inner) {}
         public SvgGdiPlusCannotBeLoadedException(string message, Exception inner) : base(message, inner) { }
 
+#if !NET8_0_OR_GREATER
         protected SvgGdiPlusCannotBeLoadedException(SerializationInfo info, StreamingContext context)
             : base(info, context) { }
+#endif
     }
 }
diff --git a/Source/Exceptions/SvgMemoryException.cs b/Source/Exceptions/SvgMemoryException.cs
@@ -1,5 +1,7 @@
 using System;
+#if !NET8_0_OR_GREATER
 using System.Runtime.Serialization;
+#endif
 
 namespace Svg.Exceptions
 {
@@ -10,7 +12,9 @@ public class SvgMemoryException : Exception
         public SvgMemoryException(string message) : base(message) { }
         public SvgMemoryException(string message, Exception inner) : base(message, inner) { }
 
+#if !NET8_0_OR_GREATER
         protected SvgMemoryException(SerializationInfo info, StreamingContext context)
             : base(info, context) { }
+#endif
     }
 }
diff --git a/Source/Helpers/StringParser.cs b/Source/Helpers/StringParser.cs
@@ -7,7 +7,7 @@ internal static class StringParser
     {
         private static readonly CultureInfo Format = CultureInfo.InvariantCulture;
 
-        public static float ToFloat(ref ReadOnlySpan<char> value)
+        public static float ToFloat(ReadOnlySpan<char> value)
         {
 #if NETSTANDARD2_1 || NETCOREAPP2_1_OR_GREATER
             return float.Parse(value, NumberStyles.Float, Format);
@@ -16,7 +16,7 @@ public static float ToFloat(ref ReadOnlySpan<char> value)
 #endif
         }
 
-        public static float ToFloatAny(ref ReadOnlySpan<char> value)
+        public static float ToFloatAny(ReadOnlySpan<char> value)
         {
 #if NETSTANDARD2_1 || NETCOREAPP2_1_OR_GREATER
             return float.Parse(value, NumberStyles.Any, Format);
@@ -25,7 +25,7 @@ public static float ToFloatAny(ref ReadOnlySpan<char> value)
 #endif
         }
 
-        public static double ToDouble(ref ReadOnlySpan<char> value)
+        public static double ToDouble(ReadOnlySpan<char> value)
         {
 #if NETSTANDARD2_1 || NETCOREAPP2_1_OR_GREATER
             return double.Parse(value, NumberStyles.Any, Format);
@@ -34,7 +34,7 @@ public static double ToDouble(ref ReadOnlySpan<char> value)
 #endif
         }
 
-        public static int ToInt(ref ReadOnlySpan<char> value)
+        public static int ToInt(ReadOnlySpan<char> value)
         {
 #if NETSTANDARD2_1 || NETCOREAPP2_1_OR_GREATER
             return int.Parse(value, NumberStyles.Integer, Format);

diff --git a/Source/Paths/CoordinateParser.cs b/Source/Paths/CoordinateParser.cs
@@ -44,7 +44,7 @@ private static bool MarkState(bool hasMode, ref CoordinateParserState state)
             return hasMode;
         }
 
-        public static bool TryGetBool(out bool result, ref ReadOnlySpan<char> chars, ref CoordinateParserState state)
+        public static bool TryGetBool(out bool result, ReadOnlySpan<char> chars, ref CoordinateParserState state)
         {
             var charsLength = chars.Length;
 
@@ -88,7 +88,7 @@ public static bool TryGetBool(out bool result, ref ReadOnlySpan<char> chars, ref
             return MarkState(false, ref state);
         }
 
-        public static bool TryGetFloat(out float result, ref ReadOnlySpan<char> chars, ref CoordinateParserState state)
+        public static bool TryGetFloat(out float result, ReadOnlySpan<char> chars, ref CoordinateParserState state)
         {
             var charsLength = chars.Length;
 
@@ -289,7 +289,7 @@ public static bool TryGetFloat(out float result, ref ReadOnlySpan<char> chars, r
                 if (state.CurrNumState != NumState.Separator && state.NewNumState < state.CurrNumState)
                 {
                     var value = chars.Slice(state.Position, state.CharsPosition - state.Position);
-                    result = StringParser.ToFloat(ref value);
+                    result = StringParser.ToFloat(value);
                     state.Position = state.CharsPosition;
                     state.CurrNumState = state.NewNumState;
                     return MarkState(true, ref state);
@@ -316,7 +316,7 @@ public static bool TryGetFloat(out float result, ref ReadOnlySpan<char> chars, r
             else
             {
                 var value = chars.Slice(state.Position, charsLength - state.Position);
-                result = StringParser.ToFloat(ref value);
+                result = StringParser.ToFloat(value);
                 state.Position = charsLength;
                 return MarkState(true, ref state);
             }