Update to .Net 10 and fix unit tests on Linux (#18)

* Update to .Net 10 and fix unit tests on Linux

* Updated CI/CD workflow for .Net 10

Author: JamesVaughan

.github/workflows/BuildAndTest.yml

@@ -4,15 +4,15 @@ on: [push, pull_request]
 
 jobs:
   build:
-    runs-on: windows-2019   
+    runs-on: windows-2025   
     steps:
     - uses: actions/checkout@v1
       with:
         submodules: recursive
     - name: Setup .NetCore
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.100
+        dotnet-version: 10.0.101
     - name: Build with dotnet
       run: |
         cd TMG-Framework

TMG-Framework/src/TMG-Framework/Saving/SaveMatrixAsCSV.cs

@@ -58,36 +58,34 @@ public override void Invoke((Matrix Matrix, WriteStream Stream) context)
 
         private void WriteCSVMatrix((Matrix Matrix, WriteStream Stream) context)
         {
-            using (StreamWriter writer = new StreamWriter(context.Stream))
+            using var writer = new StreamWriter(context.Stream);
+            var matrix = context.Matrix;
+            var rowCategories = matrix.RowCategories;
+            var columnCategories = matrix.ColumnCategories;
+            var rowLength = rowCategories.Count;
+            var columnLength = columnCategories.Count;
+            writer.Write('"');
+            writer.Write(FirstIndexHeader.Invoke().Replace('"', '\''));
+            writer.Write('\\');
+            writer.Write(SecondIndexHeader.Invoke().Replace('"', '\''));
+            writer.Write('"');
+            for (int i = 0; i < columnLength; i++)
             {
-                var matrix = context.Matrix;
-                var rowCategories = matrix.RowCategories;
-                var columnCategories = matrix.ColumnCategories;
-                var rowLength = rowCategories.Count;
-                var columnLength = columnCategories.Count;
-                writer.Write('"');
-                writer.Write(FirstIndexHeader.Invoke().Replace('"', '\''));
-                writer.Write('\\');
-                writer.Write(SecondIndexHeader.Invoke().Replace('"', '\''));
-                writer.Write('"');
-                for (int i = 0; i < columnLength; i++)
+                writer.Write(',');
+                writer.Write(columnCategories.GetSparseIndex(i));
+            }
+            writer.WriteLine();
+            var data = matrix.Data;
+            int pos = 0;
+            for (int i = 0; i < rowLength; i++)
+            {
+                writer.Write(rowCategories.GetSparseIndex(i));
+                for (int j = 0; j < columnLength; j++)
                 {
                     writer.Write(',');
-                    writer.Write(columnCategories.GetSparseIndex(i));
+                    writer.Write(data[pos]);
                 }
                 writer.WriteLine();
-                var data = matrix.Data;
-                int pos = 0;
-                for (int i = 0; i < rowLength; i++)
-                {
-                    writer.Write(rowCategories.GetSparseIndex(i));
-                    for (int j = 0; j < columnLength; j++)
-                    {
-                        writer.Write(',');
-                        writer.Write(data[pos]);
-                    }
-                    writer.WriteLine();
-                }
             }
         }
 

TMG-Framework/src/TMG-Framework/TMG-Framework.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <RootNamespace>TMG</RootNamespace>
     <Authors>University of Toronto</Authors>
     <Company>University of Toronto</Company>
@@ -20,13 +20,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Memory" Version="4.5.0" />
-    <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" />
   </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\XTMF2\src\XTMF2.Interfaces\XTMF2.Interfaces.csproj" />
     <ProjectReference Include="..\..\..\XTMF2\src\XTMF2\XTMF2.csproj" />
   </ItemGroup>
 
-</Project>
+</Project>

TMG-Framework/src/TMG-Framework/Utilities/CSVReader.cs

@@ -248,6 +248,7 @@ public bool LoadLine(out int columns)
                                 ExpandDataSections();
                             }
                             Data[numberOfColumns++] = new CsvPartition(prevEnd + 1, i);
+                            addOne = false;
                         }
                         break;
                     }
@@ -334,6 +335,7 @@ public bool LoadLine(out int columns)
                                 ExpandDataSections();
                             }
                             Data[numberOfColumns++] = new CsvPartition(prevEnd + 1, i);
+                            addOne = false;
                         }
                         break;
                     }

TMG-Framework/src/TMG-Framework/Utilities/VectorHelper/VectorHelper.cs

@@ -886,10 +886,6 @@ public static void Negate(float[] dest, float[] source, int offset, int length)
         /// <param name="value">The value to set it to.</param>
         internal static void Memset(Span<float> dest, float value)
         {
-            if (dest == null)
-            {
-                throw new ArgumentNullException(nameof(dest));
-            }
             var remainder = (dest.Length) % Vector<float>.Count;
             var destSpan = dest.Slice(0, dest.Length - remainder).NonPortableCast<float, Vector<float>>();
             var vValue = new Vector<float>(value);

TMG-Framework/tests/PerformanceTest/PerformanceTest.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
@@ -14,4 +14,4 @@
     <ProjectReference Include="..\TMG-Framework.Test\TMG-Framework.Test.csproj" />
   </ItemGroup>
 
-</Project>
+</Project>

TMG-Framework/tests/PerformanceTest/Program.cs

@@ -22,6 +22,9 @@ You should have received a copy of the GNU General Public License
 using System.Linq;
 using TMG;
 using TMG.Processing;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+[assembly: DoNotParallelize]
 
 namespace PerformanceTest
 {

TMG-Framework/tests/TMG-Framework.Test/Data/CategoryMapTest.cs

@@ -48,7 +48,7 @@ public void Aggregate()
             va.Data[2] = 2;
             va.Data[3] = 4;
             Assert.IsTrue(map.AggregateToDestination(va, out var result, ref error), error);
-            Assert.AreEqual(2, result.Data.Length);
+            Assert.HasCount(2, result.Data);
             Assert.AreSame(b, result.Categories);
             Assert.AreEqual(10, result.Data[0]);
             Assert.AreEqual(6, result.Data[1]);
@@ -95,12 +95,12 @@ public void CreateReverseIndex()
                 }, out var map, ref error), error);
             var index = map.CreateReverseIndex();
             var list = index[0];
-            Assert.AreEqual(2, list.Count);
+            Assert.HasCount(2, list);
             Assert.AreEqual(0, (int)list[0]);
             Assert.AreEqual(1, (int)list[1]);
 
             list = index[1];
-            Assert.AreEqual(2, list.Count);
+            Assert.HasCount(2, list);
             Assert.AreEqual(2, (int)list[0]);
             Assert.AreEqual(3, (int)list[1]);
         }

TMG-Framework/tests/TMG-Framework.Test/Data/RangeTest.cs

@@ -36,7 +36,7 @@ public void RangeSetSeriesConstructorTest()
         {
             List<RangeSet> tempRange = GenerateTempRange();
             RangeSetSet target = new RangeSetSet(tempRange);
-            Assert.AreEqual(target.Count, 2);
+            Assert.AreEqual(2, target.Count);
         }
 
         /// <summary>
@@ -62,8 +62,8 @@ public void TryParseTestFail()
             string rangeString = "{1-2,4-5},{11-12,14-15";
             bool actual = RangeSetSet.TryParse(ref error, rangeString, out RangeSetSet output);
             Assert.IsNotNull(error);
-            Assert.AreEqual(null, output);
-            Assert.AreEqual(false, actual);
+            Assert.IsNull(output);
+            Assert.IsFalse(actual);
         }
 
         /// <summary>
@@ -76,7 +76,7 @@ public void TryParseTestNonError()
             RangeSetSet outputExpected = new RangeSetSet(GenerateTempRange());
             var actual = RangeSetSet.TryParse(rangeString, out RangeSetSet output);
             Assert.AreEqual(outputExpected, output);
-            Assert.AreEqual(true, actual);
+            Assert.IsTrue(actual);
         }
 
         /// <summary>
@@ -89,9 +89,9 @@ public void TryParseTestSuccess()
             string rangeString = "{1-2,4-5},{11-12,14-15}";
             RangeSetSet outputExpected = new RangeSetSet(GenerateTempRange());
             var actual = RangeSetSet.TryParse(ref error, rangeString, out RangeSetSet output);
-            Assert.AreEqual(null, error);
+            Assert.IsNull(error);
             Assert.AreEqual(outputExpected, output);
-            Assert.AreEqual(true, actual);
+            Assert.IsTrue(actual);
         }
 
         private static List<RangeSet> GenerateTempRange()

TMG-Framework/tests/TMG-Framework.Test/Loading/TestLoadCategoryMapFromThirdNormalizedCSV.cs

@@ -111,7 +111,7 @@ public void LoadMapWithDestinations()
         [TestMethod]
         public void LoadMapWithBadDestinations()
         {
-            Assert.ThrowsException<XTMFRuntimeException>(() =>
+            Helper.ThrowsException<XTMFRuntimeException>(() =>
             {
                 string error = null;
                 var baseCategories = Categories.CreateCategories(new List<int> { 1, 2, 3, 4 }, ref error);
@@ -144,7 +144,7 @@ public void LoadMapWithBadDestinations()
         [TestMethod]
         public void LoadMapWithBadBase()
         {
-            Assert.ThrowsException<XTMFRuntimeException>(() =>
+            Helper.ThrowsException<XTMFRuntimeException>(() =>
             {
                 string error = null;
                 var baseCategories = Categories.CreateCategories(new List<int> { 1, 2, 4 }, ref error);