NeilMacMullen · NeilMacMullen · Jul 22, 2025 · Jul 22, 2025 · Jul 22, 2025 · Jul 22, 2025
diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml
@@ -12,14 +12,14 @@ jobs:
       DisableGitVersionTask: true
     runs-on: windows-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
     - name: Setup .NET
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 9.0.x
     - name: Package
       run: dotnet run --project build/Build.csproj -- --target Package
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v4
       with:
         name: Textrude.zip
         path: publish/Textrude.zip
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -25,24 +25,8 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: Setup .NET
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 9.0.x
     - name: Test
       run: dotnet run --project build/Build.csproj -- --target Test --configuration ${{ matrix.build_config }} --clean
-    - name: Coveralls
-      uses: coverallsapp/github-action@master
-      with:
-        github-token: ${{ secrets.GITHUB_TOKEN }}
-        flag-name: run-on-${{ matrix.os }}
-        path-to-lcov: TestResults/lcov.info
-        parallel: true
-  coveralls-finish:
-    needs: test
-    runs-on: ubuntu-latest
-    steps:
-    - name: Coveralls Finished
-      uses: coverallsapp/github-action@master
-      with:
-        github-token: ${{ secrets.github_token }}
-        parallel-finished: true
diff --git a/Engine/Engine.csproj b/Engine/Engine.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Nullable>enable</Nullable>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <PackageId>textrude.engine</PackageId>
     <Description>The engine for Textrude</Description>
     <Authors>Neil MacMullen</Authors>
@@ -18,14 +18,15 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CsvHelper" Version="31.0.2" />
+    <PackageReference Include="AwesomeAssertions" Version="9.1.0" />
+    <PackageReference Include="CsvHelper" Version="33.1.0" />
     <PackageReference Include="Humanizer" Version="2.14.1" />
-    <PackageReference Include="Microsoft.Recognizers.Text" Version="1.8.8" />
-    <PackageReference Include="Microsoft.Recognizers.Text.DateTime" Version="1.8.8" />
+    <PackageReference Include="Microsoft.Recognizers.Text" Version="1.8.13" />
+    <PackageReference Include="Microsoft.Recognizers.Text.DateTime" Version="1.8.13" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageReference Include="Scriban" Version="5.10.0" />
-    <PackageReference Include="System.Collections.Immutable" Version="8.0.0" />
-    <PackageReference Include="YamlDotNet" Version="15.1.2" />
+    <PackageReference Include="Scriban" Version="6.2.1" />
+    <PackageReference Include="System.Collections.Immutable" Version="9.0.7" />
+    <PackageReference Include="YamlDotNet" Version="16.3.0" />
   </ItemGroup>
 
 </Project>
diff --git a/Engine/Model/Deserializers/CsvModelDeserializer.cs b/Engine/Model/Deserializers/CsvModelDeserializer.cs
@@ -16,7 +16,9 @@ public Model Deserialize(string input)
     {
         using var reader = new StringReader(input);
         using var csv = new CsvReader(reader, CultureInfo.InvariantCulture);
-        var records = csv.GetRecords<object>().ToArray();
+
+
+        var records = csv.GetRecords<dynamic>().OfType<IDictionary<string, object>>().ToArray();
 
         var cleaned = ObjectGraph.FixTypes(records);
         return new Model(ModelFormat.Csv, cleaned);

diff --git a/Engine/Model/Helpers/ObjectGraph.cs b/Engine/Model/Helpers/ObjectGraph.cs
@@ -31,23 +31,31 @@ public static object FixTypes(object tree)
                 return s;
             }
             case Dictionary<object, object> d:
+            {
                 var e = new ScriptObject();
                 foreach (var (key, value) in d)
                 {
                     e[key.ToString()] = FixTypes(value);
                 }
 
                 return e;
+            }
+            //used by CsvHelper
+            case IDictionary<string, object> od:
+            {
+                var e = new ScriptObject();
+                foreach (var (key, value) in od)
+                {
+                    e[key] = FixTypes(value);
+                }
+
+                return e;
+            }
+
 
             case IEnumerable<object> l:
                 return l.Select(FixTypes).ToArray();
-
-            //used by CsvHelper
-            case ExpandoObject ex:
-                var dict = ex.ToDictionary(kv =>
-                        kv.Key,
-                    kv => FixTypes(kv.Value!));
-                return ScriptObject.From(dict);
+
             default:
                 return tree;
         }

diff --git a/ScriptLibrary/ScriptLibrary.csproj b/ScriptLibrary/ScriptLibrary.csproj
@@ -1,13 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <Folder Include="lib\" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="AwesomeAssertions" Version="9.1.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <None Update="lib\cpp.sbn">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

diff --git a/SharedApplication/SharedApplication.csproj b/SharedApplication/SharedApplication.csproj
@@ -2,12 +2,13 @@
 
   <PropertyGroup>
     <Nullable>enable</Nullable>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="AwesomeAssertions" Version="9.1.0" />
     <PackageReference Include="CommandLineParser" Version="2.9.1" />
-    <PackageReference Include="YamlDotNet" Version="15.1.2" />
+    <PackageReference Include="YamlDotNet" Version="16.3.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Tests/ApplicationEngineTests.cs b/Tests/ApplicationEngineTests.cs
@@ -2,7 +2,7 @@
 using System.Linq;
 using Engine.Application;
 using Engine.Model;
-using FluentAssertions;
+using AwesomeAssertions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Tests.Helpers;
 

diff --git a/Tests/CommandLineBuilderTests.cs b/Tests/CommandLineBuilderTests.cs
@@ -1,4 +1,4 @@
-using FluentAssertions;
+using AwesomeAssertions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using SharedApplication;
 

diff --git a/Tests/CsvModelTests.cs b/Tests/CsvModelTests.cs
@@ -2,7 +2,7 @@
 using System.Linq;
 using Engine.Application;
 using Engine.Model;
-using FluentAssertions;
+using AwesomeAssertions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Tests.Helpers;
 

diff --git a/Tests/DateTimeRecogniserTests.cs b/Tests/DateTimeRecogniserTests.cs
@@ -1,5 +1,5 @@
 using System;
-using FluentAssertions;
+using AwesomeAssertions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace Tests;
@@ -72,8 +72,8 @@ public void RelativeTimeShouldBeCorrect()
         //"yesterday" defaults to the first instant of the day
         var s = ExpectDateTime(basis, "yesterday");
         var duration = (basis - s);
-        duration.Should().BeGreaterOrEqualTo(TimeSpan.FromDays(1));
-        duration.Should().BeLessOrEqualTo(TimeSpan.FromDays(2));
+        duration.Should().BeGreaterThanOrEqualTo(TimeSpan.FromDays(1));
+        duration.Should().BeLessThanOrEqualTo(TimeSpan.FromDays(2));
     }
 
 

diff --git a/Tests/DefinitionParserTests.cs b/Tests/DefinitionParserTests.cs
@@ -1,6 +1,6 @@
 using System;
 using Engine.Application;
-using FluentAssertions;
+using AwesomeAssertions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace Tests;

diff --git a/Tests/ExtensionTests.cs b/Tests/ExtensionTests.cs
@@ -1,6 +1,6 @@
 using System;
 using Engine.Application;
-using FluentAssertions;
+using AwesomeAssertions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Tests.Helpers;
 

diff --git a/Tests/FormatGuesserTests.cs b/Tests/FormatGuesserTests.cs
@@ -1,6 +1,6 @@
 using Engine.Application;
 using Engine.Model;
-using FluentAssertions;
+using AwesomeAssertions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace Tests;

diff --git a/Tests/JObjectTests.cs b/Tests/JObjectTests.cs
@@ -1,5 +1,5 @@
 using System.Linq;
-using FluentAssertions;
+using AwesomeAssertions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Newtonsoft.Json.Linq;
 

diff --git a/Tests/LineProcessingTests.cs b/Tests/LineProcessingTests.cs
@@ -1,6 +1,6 @@
 using System;
 using Engine.TemplateProcessing;
-using FluentAssertions;
+using AwesomeAssertions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace Tests;

diff --git a/Tests/MultiFileTests.cs b/Tests/MultiFileTests.cs
@@ -1,6 +1,6 @@
 using Engine.Application;
 using Engine.Model;
-using FluentAssertions;
+using AwesomeAssertions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Tests.Helpers;
 

diff --git a/Tests/NamedFileTests.cs b/Tests/NamedFileTests.cs
@@ -1,5 +1,5 @@
 using Engine.Model;
-using FluentAssertions;
+using AwesomeAssertions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using SharedApplication;
 

diff --git a/Tests/QueryTests.cs b/Tests/QueryTests.cs
@@ -2,7 +2,7 @@
 using System.Text.Json;
 using Engine.Application;
 using Engine.Model;
-using FluentAssertions;
+using AwesomeAssertions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Tests.Helpers;
 

diff --git a/Tests/RangeRecogniserTests.cs b/Tests/RangeRecogniserTests.cs
@@ -1,5 +1,5 @@
 using System;
-using FluentAssertions;
+using AwesomeAssertions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace Tests;

diff --git a/Tests/ScribanAssumptionTests.cs b/Tests/ScribanAssumptionTests.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using FluentAssertions;
+using AwesomeAssertions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Scriban;
 using Scriban.Runtime;

diff --git a/Tests/StructuredModelTests.cs b/Tests/StructuredModelTests.cs
@@ -1,7 +1,7 @@
 using System;
 using Engine.Application;
 using Engine.Model;
-using FluentAssertions;
+using AwesomeAssertions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Tests.Helpers;
 

diff --git a/Tests/TemplateManagerTests.cs b/Tests/TemplateManagerTests.cs
@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Engine.Application;
-using FluentAssertions;
+using AwesomeAssertions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Tests.Helpers;
 

diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
@@ -1,24 +1,25 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
 
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
-    <PackageReference Include="FluentAssertions" Version="6.12.0" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.4.3" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.4.3" />
+    <PackageReference Include="AwesomeAssertions" Version="9.1.0" />
 
-    <PackageReference Include="coverlet.collector" Version="6.0.2">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.9.3" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.9.3" />
+
+    <PackageReference Include="coverlet.collector" Version="6.0.4">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
 
-    <PackageReference Include="TimeZoneConverter" Version="6.1.0" />
+    <PackageReference Include="TimeZoneConverter" Version="7.0.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/Tests/TextrudeCliTests.cs b/Tests/TextrudeCliTests.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Linq;
 using Engine.Application;
-using FluentAssertions;
+using AwesomeAssertions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using SharedApplication;
 using Tests.Helpers;

diff --git a/Tests/TextrudeExtensionMethodTests.cs b/Tests/TextrudeExtensionMethodTests.cs
@@ -1,5 +1,5 @@
 using Engine.Application;
-using FluentAssertions;
+using AwesomeAssertions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Tests.Helpers;
 

diff --git a/Tests/TimeTestMethods.cs b/Tests/TimeTestMethods.cs
@@ -1,6 +1,6 @@
 using System;
 using Engine.Extensions.TimeRange;
-using FluentAssertions;
+using AwesomeAssertions;
 using TimeZoneConverter;
 
 namespace Tests;

diff --git a/Tests/VersionTests.cs b/Tests/VersionTests.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Linq;
 using Engine.Application;
-using FluentAssertions;
+using AwesomeAssertions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Newtonsoft.Json;
 

diff --git a/Tests/YamlAssumptionTests.cs b/Tests/YamlAssumptionTests.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using FluentAssertions;
+using AwesomeAssertions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using SharedApplication;
 using YamlDotNet.Serialization;

diff --git a/Tests/YamlDeserializerTests.cs b/Tests/YamlDeserializerTests.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using Engine.Model;
 using Engine.Model.Deserializers;
-using FluentAssertions;
+using AwesomeAssertions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace Tests;

diff --git a/Textrude.v3.ncrunchsolution b/Textrude.v3.ncrunchsolution
@@ -1,6 +1,8 @@
 <SolutionConfiguration>
   <Settings>
     <AllowParallelTestExecution>False</AllowParallelTestExecution>
+    <EnableRDI>False</EnableRDI>
+    <RdiConfigured>True</RdiConfigured>
     <SolutionConfigured>True</SolutionConfigured>
   </Settings>
 </SolutionConfiguration>