Target .NET 9 and Upgrade Packages

wbaldoumas · wbaldoumas · commit 141711d28957 · 2025-02-01T13:31:31.000-08:00
diff --git a/.editorconfig b/.editorconfig
@@ -31,6 +31,9 @@ dotnet_diagnostic.SA1633.severity = none
 # require standardized summary test for constructors
 dotnet_diagnostic.SA1642.severity = none
 
+# opening square brackets cannot be preceded by a space
+dotnet_diagnostic.SA1010.severity = none
+
 [*Tests.cs]
 
 # require XML documentation
diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml
@@ -17,9 +17,8 @@ jobs:
       uses: actions/setup-dotnet@v4
       with:
         dotnet-version: |
-          6.0.x
-          7.0.x
           8.0.x
+          9.0.x
 
     - name: Restore Dependencies
       run: dotnet restore src
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -51,7 +51,7 @@ jobs:
     - name: Setup .NET 8
       uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 8.0.x        
+        dotnet-version: 9.0.x
 
     # Restore & Build
     - name: Restore
diff --git a/.github/workflows/publish-preview.yml b/.github/workflows/publish-preview.yml
@@ -22,9 +22,8 @@ jobs:
       uses: actions/setup-dotnet@v4
       with:
         dotnet-version: |
-          6.0.x
-          7.0.x
           8.0.x
+          9.0.x
 
     - name: Restore Dependencies
       run: dotnet restore src
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -19,9 +19,8 @@ jobs:
       uses: actions/setup-dotnet@v4
       with:
         dotnet-version: |
-          6.0.x
-          7.0.x
           8.0.x
+          9.0.x
 
     - name: Restore Dependencies
       run: dotnet restore src
diff --git a/src/Markdown.ColorCode.CSharpToColoredHtml/Internal/CSharpToColoredHtmlFormatter.cs b/src/Markdown.ColorCode.CSharpToColoredHtml/Internal/CSharpToColoredHtmlFormatter.cs
@@ -1,5 +1,6 @@
 ﻿using System.Diagnostics.CodeAnalysis;
 using ColorCode.Common;
+using CsharpToColouredHTML.Core.Emitters.HTML;
 
 namespace Markdown.ColorCode.CSharpToColoredHtml.Internal;
 
diff --git a/src/Markdown.ColorCode.CSharpToColoredHtml/Internal/HtmlFormatterFactoryWithCSharpToColoredHtml.cs b/src/Markdown.ColorCode.CSharpToColoredHtml/Internal/HtmlFormatterFactoryWithCSharpToColoredHtml.cs
@@ -1,4 +1,5 @@
 ﻿using System.Diagnostics.CodeAnalysis;
+using CsharpToColouredHTML.Core.Emitters.HTML;
 
 namespace Markdown.ColorCode.CSharpToColoredHtml.Internal;
 
diff --git a/src/Markdown.ColorCode.CSharpToColoredHtml/Markdown.ColorCode.CSharpToColoredHtml.csproj b/src/Markdown.ColorCode.CSharpToColoredHtml/Markdown.ColorCode.CSharpToColoredHtml.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net7.0;net8.0</TargetFrameworks>
+		<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -46,7 +46,7 @@
 
 	<ItemGroup>
     <PackageReference Include="ColorCode.Core" Version="2.0.15" />
-	  <PackageReference Include="CsharpToColouredHTML.Core" Version="1.0.44" />
+	  <PackageReference Include="CsharpToColouredHTML.Core" Version="3.0.2" />
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/src/Markdown.ColorCode.CSharpToColoredHtml/MarkdownPipelineBuilderExtensions.cs b/src/Markdown.ColorCode.CSharpToColoredHtml/MarkdownPipelineBuilderExtensions.cs
@@ -1,4 +1,6 @@
-﻿namespace Markdown.ColorCode.CSharpToColoredHtml;
+﻿using CsharpToColouredHTML.Core.Emitters.HTML;
+
+namespace Markdown.ColorCode.CSharpToColoredHtml;
 
 /// <summary>
 ///     Extensions for adding ColorCode code colorization to the Markdig <see cref="MarkdownPipelineBuilder"/>.
@@ -24,7 +26,7 @@ public static MarkdownPipelineBuilder UseColorCodeWithCSharpToColoredHtml(
         string? defaultLanguageId = null)
     {
         var languageExtractor = new LanguageExtractor(
-            additionalLanguages ?? Enumerable.Empty<ILanguage>(),
+            additionalLanguages ?? [],
             defaultLanguageId ?? string.Empty
         );
 
diff --git a/src/Markdown.ColorCode/AssemblyInfo.cs b/src/Markdown.ColorCode/AssemblyInfo.cs
@@ -1,7 +1,6 @@
 ﻿global using ColorCode;
 global using ColorCode.Styling;
 global using Markdig;
-global using Markdig.Helpers;
 global using Markdig.Parsers;
 global using Markdig.Renderers;
 global using Markdig.Renderers.Html;
diff --git a/src/Markdown.ColorCode/Internal/CodeExtractor.cs b/src/Markdown.ColorCode/Internal/CodeExtractor.cs
@@ -9,7 +9,7 @@ public string ExtractCode(LeafBlock leafBlock)
         var code = new StringBuilder();
 
         // ReSharper disable once NullCoalescingConditionIsAlwaysNotNullAccordingToAPIContract
-        var lines = leafBlock.Lines.Lines ?? Array.Empty<StringLine>();
+        var lines = leafBlock.Lines.Lines ?? [];
         var totalLines = lines.Length;
 
         for (var index = 0; index < totalLines; index++)
diff --git a/src/Markdown.ColorCode/Markdown.ColorCode.csproj b/src/Markdown.ColorCode/Markdown.ColorCode.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net8.0;net9.0</TargetFrameworks>
     <langversion>latest</langversion>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
diff --git a/src/Markdown.ColorCode/MarkdownPipelineBuilderExtensions.cs b/src/Markdown.ColorCode/MarkdownPipelineBuilderExtensions.cs
@@ -22,7 +22,7 @@ public static MarkdownPipelineBuilder UseColorCode(
         string? defaultLanguageId = null)
     {
         var languageExtractor = new LanguageExtractor(
-            additionalLanguages ?? Enumerable.Empty<ILanguage>(),
+            additionalLanguages ?? [],
             defaultLanguageId ?? string.Empty
         );
 
diff --git a/tests/Markdown.ColorCode.UnitTests/Internal/ColorCodeBlockRendererTests.cs b/tests/Markdown.ColorCode.UnitTests/Internal/ColorCodeBlockRendererTests.cs
@@ -112,7 +112,7 @@ That was some **code**.
 
     private static readonly MarkdownPipeline DefaultLanguagePipeline = new MarkdownPipelineBuilder()
         .UseAdvancedExtensions()
-        .UseColorCode(HtmlFormatterType.Style, StyleDictionary.DefaultDark, Enumerable.Empty<ILanguage>(), "csharp")
+        .UseColorCode(HtmlFormatterType.Style, StyleDictionary.DefaultDark, [], "csharp")
         .Build();
 
     private static IEnumerable<TestCaseData> TestCases
@@ -298,7 +298,7 @@ public void When_code_block_is_not_a_fenced_code_block_renderer_uses_internal_re
 
         var colorCodeBlockRenderer = new ColorCodeBlockRenderer(
             mockUnderlyingCodeBlockRenderer,
-            new LanguageExtractor(Enumerable.Empty<ILanguage>(), string.Empty),
+            new LanguageExtractor([], string.Empty),
             new CodeExtractor(),
             new HtmlStyleFormatter(StyleDictionary.DefaultDark)
         );
diff --git a/tests/Markdown.ColorCode.UnitTests/Internal/ColorCodeExtensionTests.cs b/tests/Markdown.ColorCode.UnitTests/Internal/ColorCodeExtensionTests.cs
@@ -12,7 +12,7 @@ public void When_markdown_renderer_is_not_html_renderer_setup_is_aborted()
         var pipeline = new MarkdownPipelineBuilder().Build();
 
         var colorCodeExtension = new ColorCodeExtension(
-            new LanguageExtractor(Enumerable.Empty<ILanguage>(), string.Empty),
+            new LanguageExtractor([], string.Empty),
             new CodeExtractor(),
             new HtmlStyleFormatter(StyleDictionary.DefaultDark)
         );
@@ -37,7 +37,7 @@ public void When_original_code_block_renderer_is_not_present_it_is_created()
         invalidRenderer.ObjectRenderers.TryRemove<CodeBlockRenderer>();
 
         var colorCodeExtension = new ColorCodeExtension(
-            new LanguageExtractor(Enumerable.Empty<ILanguage>(), string.Empty),
+            new LanguageExtractor([], string.Empty),
             new CodeExtractor(),
             new HtmlStyleFormatter(StyleDictionary.DefaultDark)
         );
diff --git a/tests/Markdown.ColorCode.UnitTests/Internal/HtmlFormatterFactoryTests.cs b/tests/Markdown.ColorCode.UnitTests/Internal/HtmlFormatterFactoryTests.cs
@@ -9,7 +9,7 @@ internal sealed class HtmlFormatterFactoryTests
     [SetUp]
     public void Setup()
     {
-        _styleDictionary = new StyleDictionary(); // Assuming appropriate construction or mock
+        _styleDictionary = []; // Assuming appropriate construction or mock
         _factory = new HtmlFormatterFactory(_styleDictionary);
     }
 
diff --git a/tests/Markdown.ColorCode.UnitTests/Internal/LanguageExtractorTests.cs b/tests/Markdown.ColorCode.UnitTests/Internal/LanguageExtractorTests.cs
@@ -14,7 +14,7 @@ public void SetUp()
         _mockLanguage.Id.Returns("text");
         _mockLanguage.Name.Returns("Text");
 
-        _languageExtractor = new LanguageExtractor(new[] { _mockLanguage }, "text");
+        _languageExtractor = new LanguageExtractor([_mockLanguage], "text");
     }
 
     [Test]
@@ -57,7 +57,7 @@ public void When_LanguageExtractor_cannot_extract_language_id_default_language_i
     public void When_LanguageExtractor_does_not_have_default_language_null_is_returned()
     {
         // arrange
-        var noDefaultColorCodeLanguageExtractor = new LanguageExtractor(new[] { _mockLanguage }, string.Empty);
+        var noDefaultColorCodeLanguageExtractor = new LanguageExtractor([_mockLanguage], string.Empty);
 
         var mockFencedCodeBlock = Substitute.For<IFencedBlock>();
 
diff --git a/tests/Markdown.ColorCode.UnitTests/Markdown.ColorCode.UnitTests.csproj b/tests/Markdown.ColorCode.UnitTests/Markdown.ColorCode.UnitTests.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 	<TreatWarningsAsErrors>true</TreatWarningsAsErrors>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using System.Diagnostics.CodeAnalysis;`
	`2`	`+using CsharpToColouredHTML.Core.Emitters.HTML;`
`2`	`3`
`3`	`4`	`namespace Markdown.ColorCode.CSharpToColoredHtml.Internal;`
`4`	`5`