Workflows, projects, and packages updates

.github/workflows/Benchmark.yml

@@ -5,13 +5,15 @@ jobs:
   Rendering:
     runs-on: windows-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         submodules: 'recursive'
-    - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 3.1.401
+        dotnet-version: |
+          3.1.x
+          6.0.x
     - run: dotnet run -p CSharpMath.Rendering.Benchmarks
     - name: Store benchmark result
       uses: Happypig375/github-action-benchmark@v1

.github/workflows/Build.yml

@@ -5,18 +5,18 @@ jobs:
   Everything:
     runs-on: windows-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         submodules: 'recursive'
-    - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '3.1.401'
-    - name: Setup NuGet
-      uses: NuGet/setup-nuget@v1.0.5
+        dotnet-version: |
+          6.0.x
+          10.0.x
     - name: Setup MSBuild Path
-      uses: microsoft/setup-msbuild@v1.0.2
+      uses: microsoft/setup-msbuild@v2
     - name: Restore NuGet Packages
-      run: nuget restore CSharpMath.sln
+      run: dotnet restore CSharpMath.sln
     - name: Build Everything
       run: msbuild CSharpMath.sln /p:Configuration=Release

.github/workflows/Release.yml

@@ -7,13 +7,15 @@ jobs:
   CSharpMath:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         submodules: 'recursive'
-    - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '3.1.401'
+        dotnet-version: |
+          3.1.x
+          6.0.x
     - name: Build GitHub Releases draft artifacts
       env:
         RELEASE_NOTES: |

.github/workflows/Test.yml

@@ -7,25 +7,18 @@ jobs:
     steps:
     - name: Update draft on GitHub Releases
       id: release_drafter
-      uses: release-drafter/release-drafter@v5
+      uses: release-drafter/release-drafter@v6
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         submodules: 'recursive'
-    - name: Setup .NET Core # Required to execute ReportGenerator
-      uses: actions/setup-dotnet@v1
+    - name: Setup .NET # Required to execute ReportGenerator
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '3.1.401'
-    - name: Update dependencies in CSharpMath.Xaml.Tests.NuGet
-      run: |
-        dotnet tool install -g dotnet-outdated
-        update() {
-          dotnet outdated -u CSharpMath.Xaml.Tests.NuGet
-          dotnet outdated -pre Always -inc CSharpMath -u CSharpMath.Xaml.Tests.NuGet
-        }
-        # retry 5 times since dotnet outdated fails often: https://github.com/jerriep/dotnet-outdated/issues/299
-        update || update || update || update || update
+        dotnet-version: |
+          6.0.x
+          10.0.x
     - name: Build and Test
       env:
         RELEASE_NOTES: |
@@ -35,46 +28,46 @@ jobs:
       run: |
         # .NET Core MSBuild cannot parse , and ; correctly so we replace them with substitutions: https://github.com/dotnet/msbuild/issues/471#issuecomment-366268743
         # https://www.gnu.org/software/bash/manual/bash.html#Shell-Parameter-Expansion
-        # ${parameter/pattern/string} If pattern begins with ‘/’, all matches of pattern are replaced with string. Normally only the first match is replaced.
+        # ${parameter/pattern/string} If pattern begins with '/', all matches of pattern are replaced with string. Normally only the first match is replaced.
         RELEASE_NOTES=${RELEASE_NOTES//,/%2C}
         RELEASE_NOTES=${RELEASE_NOTES//;/%3B}
 
         # --collect:"XPlat Code Coverage" means collect test coverage with https://github.com/coverlet-coverage/coverlet
         # Coverlet settings come after --: https://github.com/coverlet-coverage/coverlet/blob/master/Documentation/VSTestIntegration.md#advanced-options-supported-via-runsettings
-        dotnet test CSharpMath.CrossPlatform.slnf -c Release -l GitHubActions --blame --collect:"XPlat Code Coverage" -r .testcoverage -p:PackageReleaseNotes="$RELEASE_NOTES" -p:PackageVersion=${{ steps.release_drafter.outputs.tag_name || format('{0}-pr', github.event.number) }}-ci-${{ github.sha }} -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.IncludeTestAssembly=true
+        dotnet test CSharpMath.CrossPlatform.slnf -c Release -l GitHubActions --blame --collect:"XPlat Code Coverage" --results-directory .testcoverage -p:PackageReleaseNotes="$RELEASE_NOTES" -p:PackageVersion=${{ steps.release_drafter.outputs.tag_name || format('{0}-pr', github.event.number) }}-ci-${{ github.sha }} -- DataCollectionRunSettings.DataCollectors.DataCollector.Configuration.IncludeTestAssembly=true
     - name: Run ReportGenerator on Test Coverage results
-      uses: danielpalme/ReportGenerator-GitHub-Action@4.6.7
+      uses: danielpalme/ReportGenerator-GitHub-Action@5
       with:
         reports: '.testcoverage/**/*.*' # REQUIRED # The coverage reports that should be parsed (separated by semicolon). Globbing is supported.
         targetdir: '.testcoverage/report' # REQUIRED # The directory where the generated report should be saved.
         reporttypes: 'Html' # The output formats and scope (separated by semicolon) Values: Badges, Clover, Cobertura, CsvSummary, Html, HtmlChart, HtmlInline, HtmlInline_AzurePipelines, HtmlInline_AzurePipelines_Dark, HtmlSummary, JsonSummary, Latex, LatexSummary, lcov, MHtml, PngChart, SonarQube, TeamCitySummary, TextSummary, Xml, XmlSummary
         title: 'CSharpMath test coverage results' # Optional title.
         tag: ${{ steps.release_drafter.outputs.tag_name || format('{0}-pr', github.event.number) }}-ci-${{ github.sha }} # Optional tag or build version.
     - name: Upload CSharpMath test coverage results as CI artifacts
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: CSharpMath test coverage results
         path: .testcoverage/
     - name: Upload CSharpMath test coverage results to codecov.io
-      uses: codecov/codecov-action@v1
+      uses: codecov/codecov-action@v4
       with:
         file: .testcoverage/**/*.xml # optional
         name: CSharpMath test coverage # optional
         fail_ci_if_error: true # optional (default = false)
     - name: Upload CSharpMath.Rendering.Tests results as CI artifacts
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       if: always() # Run even when a previous step failed: https://stackoverflow.com/a/58859404/5429648
       with:
         name: CSharpMath.Rendering.Tests results
         path: CSharpMath.Rendering.Tests/*/*.png
     - name: Upload CSharpMath.Xaml.Tests.NuGet results as CI artifacts
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       if: always()
       with:
         name: CSharpMath.Xaml.Tests.NuGet results
         path: CSharpMath.Xaml.Tests.NuGet/*.png
     - name: Upload NuGet packages as CI artifacts
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       if: always()
       with:
         name: NuGet packages
@@ -90,10 +83,10 @@ jobs:
   Ios:
     runs-on: macos-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
       with:
         submodules: 'recursive'
-    - run: nuget restore CSharpMath.sln
+    - run: dotnet restore CSharpMath.sln
     - run: msbuild CSharpMath.Ios.Tests
     - name: Run tests
       env:
@@ -171,7 +164,7 @@ jobs:
         if [[ "$TESTS_OUTPUT" == *"[FAIL]"* ]]
         then exit 1
         fi
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v4
       if: always() # Run even when a previous step failed: https://stackoverflow.com/a/58859404/5429648
       with:
         name: CSharpMath.Ios.Tests Results

CSharpMath.Apple/BackEnd/JsonMathTable.cs

@@ -5,6 +5,8 @@
 using System.Collections.Generic;
 using System.Linq;
 
+# nullable disable
+
 namespace CSharpMath.Apple {
   /// <summary>Holds lots of constants for spacing between
   /// various visible elements by reading a JSON file.</summary>
@@ -136,7 +138,7 @@ public override float RadicalExtraAscender(TFont font) =>
     private const string _startConnectorKey = "startConnector";
     private const string _extenderKey = "extender";
     private const string _glyphKey = "glyph";
-    public override IEnumerable<GlyphPart<TGlyph>>? GetVerticalGlyphAssembly(TGlyph rawGlyph, TFont font) =>
+    public override IEnumerable<GlyphPart<TGlyph>> GetVerticalGlyphAssembly(TGlyph rawGlyph, TFont font) =>
       _assemblyTable[GlyphNameProvider.GetGlyphName(rawGlyph)]?[_assemblyPartsKey] is JArray parts
       ? parts.Select(partInfo =>
         new GlyphPart<TGlyph>(

CSharpMath.Apple/Resources/ManifestResources.cs

@@ -14,7 +14,7 @@ public static JToken LatinMath {
           using var textReader = new StreamReader(LatinMathContent);
           using var reader = new Newtonsoft.Json.JsonTextReader(textReader);
           _latinMath =
-            new Newtonsoft.Json.JsonSerializer().Deserialize<JObject>(reader).Root;
+            new Newtonsoft.Json.JsonSerializer().Deserialize<JObject>(reader)!.Root;
         }
         return _latinMath;
       }

CSharpMath.Avalonia.Example/CSharpMath.Avalonia.Example.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <OutputType>WinExe</OutputType>
   </PropertyGroup>
 

CSharpMath.CoreTests/CSharpMath.CoreTests.csproj

@@ -8,6 +8,5 @@
     <Compile Include="..\CSharpMath.Apple\Resources\ManifestResourceProvider.cs" Link="_Helpers\Resources\ManifestResourceProvider.cs" />
     <EmbeddedResource Include="_Helpers\Resources\latinmodern-math.json" />
     <ProjectReference Include="..\CSharpMath\CSharpMath.csproj" />
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
   </ItemGroup>
 </Project>

CSharpMath.CoreTests/MockTests.cs

@@ -29,8 +29,5 @@ public void TestGlyphBoundsWithM() {
     [Fact]
     public void ResourceProviderFindsResource() =>
       Assert.NotNull(Resources.ManifestResources.LatinMathContent);
-    [Fact]
-    public void ResourceProviderFindsMathConfiguration() =>
-      Assert.IsType<Newtonsoft.Json.Linq.JObject>(Resources.ManifestResources.LatinMath["constants"]);
   }
 }

CSharpMath.CrossPlatform.slnf

@@ -22,7 +22,6 @@
       "Typography/Typography.OpenFont/Typography.OpenFont.shproj",
       "Typography/Typography.GlyphLayout/Typography.GlyphLayout.shproj",
       "Typography/Typography.TextBreak/Typography.TextBreak/Typography.TextBreak.shproj",
-      "Typography/Typography.TextBreak/Typography.TextBreak.UnitTests/TextBreakTests.csproj",
       "CSharpMath.Playground/CSharpMath.Playground.csproj",
       "CSharpMath.Avalonia/CSharpMath.Avalonia.csproj",
       "CSharpMath.Avalonia.Example/CSharpMath.Avalonia.Example.csproj",

CSharpMath.Editor.Tests.Visualizer/CSharpMath.Editor.Tests.Visualizer.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <StartupObject>CSharpMath.Editor.Tests.Visualizer.Checker</StartupObject>
   </PropertyGroup>
 

CSharpMath.Playground/CSharpMath.Playground.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 

CSharpMath.Rendering.Benchmarks/CSharpMath.Rendering.Benchmarks.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="..\CSharpMath.Rendering.Tests\TestRenderingMathData.cs" Link="TestRenderingMathData.cs" />

CSharpMath.Rendering/BackEnd/Fonts.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Typography.OpenFont;
+using Typography.OpenFont.Extensions;
 
 namespace CSharpMath.Rendering.BackEnd {
   public class Fonts : Display.FrontEnd.IFont<Glyph>, IEnumerable<Typeface> {

CSharpMath.Rendering/BackEnd/GlyphBoundsProvider.cs

@@ -12,7 +12,7 @@ private GlyphBoundsProvider() { }
       (Fonts font, IEnumerable<Glyph> glyphs, int nGlyphs) {
       var advances = new List<float>(nGlyphs);
       foreach (var glyph in glyphs)
-        advances.Add(glyph.Typeface.GetHAdvanceWidthFromGlyphIndex(glyph.Info.GlyphIndex) *
+        advances.Add(glyph.Typeface.GetAdvanceWidthFromGlyphIndex(glyph.Info.GlyphIndex) *
           glyph.Typeface.CalculateScaleToPixelFromPointSize(font.PointSize));
       return (advances, advances.Sum());
     }

CSharpMath.Rendering/BackEnd/GraphicsContext.cs

@@ -8,7 +8,7 @@
 
 namespace CSharpMath.Rendering.BackEnd {
   public class GraphicsContext : IGraphicsContext<Fonts, Glyph> {
-    private class GlyphOutlineBuilder : Typography.Contours.GlyphOutlineBuilderBase {
+    private class GlyphOutlineBuilder : Typography.OpenFont.Contours.GlyphOutlineBuilderBase {
       public GlyphOutlineBuilder(Typeface typeface) : base(typeface) { }
     }
     public GraphicsContext(ICanvas canvas, (Color glyph, Color textRun)? glyphBoxColor) {
@@ -72,7 +72,7 @@ public void DrawGlyphRunWithOffset
         pathBuilder.BuildFromGlyph(glyph.Info, pointSize);
         Canvas.CurrentColor = foreground ?? color;
         pathBuilder.ReadShapes(Canvas.StartNewPath());
-        Canvas.Translate(typeface.GetHAdvanceWidthFromGlyphIndex(index) * scale + kernAfter, 0);
+        Canvas.Translate(typeface.GetAdvanceWidthFromGlyphIndex(index) * scale + kernAfter, 0);
       }
       Canvas.Restore();
     }

CSharpMath.Rendering/BackEnd/MathTable.cs

@@ -24,7 +24,7 @@ float ReadRecord(MathValueRecord rec, Fonts fonts) =>
     public override float FractionNumeratorShiftUp(Fonts fonts) => ReadRecord(fonts.MathConsts.FractionNumeratorShiftUp, fonts);
     public override float FractionRuleThickness(Fonts fonts) => ReadRecord(fonts.MathConsts.FractionRuleThickness, fonts);
     (IEnumerable<Glyph> variants, int count)? GetVariants(Typeface typeface, MathGlyphConstruction? glyphs) {
-      var records = glyphs?.GlyphVariantRecords;
+      var records = glyphs?.glyphVariantRecords;
       if (records == null) return null;
       return (records.Select(record => new Glyph(typeface, typeface.GetGlyph(record.VariantGlyph))), records.Length);
     }
@@ -35,7 +35,7 @@ public override (IEnumerable<Glyph> variants, int count) GetVerticalVariantsForG
     public override float GetItalicCorrection(Fonts fonts, Glyph glyph) =>
       glyph.Info.MathGlyphInfo?.ItalicCorrection?.Value * glyph.Typeface.CalculateScaleToPixelFromPointSize(fonts.PointSize) ?? 0;
     public override Glyph GetLargerGlyph(Fonts fonts, Glyph glyph) {
-      var variants = glyph.Info.MathGlyphInfo?.VertGlyphConstruction?.GlyphVariantRecords;
+      var variants = glyph.Info.MathGlyphInfo?.VertGlyphConstruction?.glyphVariantRecords;
       var glyphIndex = glyph.Info.GlyphIndex;
       foreach (var variant in variants ?? System.Array.Empty<MathGlyphVariantRecord>()) {
         var variantIndex = variant.VariantGlyph;
@@ -50,7 +50,7 @@ public override Glyph GetLargerGlyph(Fonts fonts, Glyph glyph) {
     public override IEnumerable<GlyphPart<Glyph>>? GetVerticalGlyphAssembly(Glyph rawGlyph, Fonts fonts) {
       var scale = rawGlyph.Typeface.CalculateScaleToPixelFromPointSize(fonts.PointSize);
       return
-        rawGlyph.Info.MathGlyphInfo?.VertGlyphConstruction?.GlyphAsm?.GlyphPartRecords.Select(record =>
+        rawGlyph.Info.MathGlyphInfo?.VertGlyphConstruction?.GlyphAsm_GlyphPartRecords.Select(record =>
         new GlyphPart<Glyph>(
           new Glyph(rawGlyph.Typeface, rawGlyph.Typeface.GetGlyph(record.GlyphId)),
           record.FullAdvance * scale,
@@ -92,7 +92,7 @@ public override float MinConnectorOverlap(Fonts fonts) =>
     public override float GetTopAccentAdjustment(Fonts fonts, Glyph glyph) =>
       (glyph.Info.MathGlyphInfo?.TopAccentAttachment?.Value
       // If no top accent is defined then it is the center of the advance width.
-      ?? glyph.Typeface.GetHAdvanceWidthFromGlyphIndex(glyph.Info.GlyphIndex) / 2)
+      ?? glyph.Typeface.GetAdvanceWidthFromGlyphIndex(glyph.Info.GlyphIndex) / 2)
       //remember to scale the unit
       * glyph.Typeface.CalculateScaleToPixelFromPointSize(fonts.PointSize);
     public override float UnderbarRuleThickness(Fonts fonts) => ReadRecord(fonts.MathConsts.UnderbarRuleThickness, fonts);

CSharpMath.Rendering/CSharpMath.Rendering.csproj

@@ -3,6 +3,8 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Description>Rendering interface for CSharpMath using the Typography library.</Description>
+      <!-- Suppress nullable reference type warnings from Typography submodule -->
+      <NoWarn>$(NoWarn);CS8618;CS8603;CS8625;CS8600;CS8601;CS8602;CS8604</NoWarn>
   </PropertyGroup>
   <ItemGroup>
     <EmbeddedResource Include="Reference Fonts\*.otf" />

CSharpMath.Rendering/Text/BreakAtInfo.cs

@@ -0,0 +1,15 @@
+using Typography.TextBreak;
+
+// BreakAtInfo from Typography, moved here since this is now in a test project in Typography
+
+namespace CSharpMath.Rendering.Text {
+  internal struct BreakAtInfo {
+    public readonly int breakAt;
+    public readonly WordKind wordKind;
+
+    public BreakAtInfo(int breakAt, WordKind wordKind) {
+      this.breakAt = breakAt;
+      this.wordKind = wordKind;
+    }
+  }
+}

CSharpMath.Rendering/Text/TextLaTeXParser.cs

@@ -52,7 +52,7 @@ public static Result<TextAtom> TextAtomFromLaTeX(string latexSource) {
       int dollarCount = 0;
       var globalAtoms = new TextAtomListBuilder();
       List<BreakAtInfo> breakList = new List<BreakAtInfo>(); // Roslyn bug that assumes breakList is nullable resulting in warnings so var is not used
-      var breaker = new CustomBreaker(v => breakList.Add(new BreakAtInfo(v.LatestBreakAt, v.LatestWordKind))) {
+      var breaker = new CustomBreaker() { // v => breakList.Add(new BreakAtInfo(v.LatestBreakAt, v.LatestWordKind)) // The CustomBreaker constructor no longer takes an argument
         BreakNumberAfterText = true,
         ThrowIfCharOutOfRange = false
       };

CSharpMath.Xaml.Tests/Test.cs

@@ -45,7 +45,7 @@ IDisposable SetBinding<TView>(TView view, string propertyName, TBindingMode? bin
       SetBinding(view,
         (TProperty)typeof(TView)
         .GetField(propertyName + "Property", BindingFlags.Public | BindingFlags.Static | BindingFlags.FlattenHierarchy)
-        ?.GetValue(view) ?? throw new NotImplementedException($"Property not found in {typeof(TView)}: {propertyName}"),
+        ?.GetValue(view)! ?? throw new NotImplementedException($"Property not found in {typeof(TView)}: {propertyName}"),
         propertyName,
         bindingMode ?? Default);
     [Fact]