Target .NET 6 & 8; Test net48, 6, and 8. Test ubuntu

.github/workflows/ci.yml

@@ -11,7 +11,7 @@ on:
 
 jobs:
   build:
-    runs-on: windows-latest
+    runs-on: [windows-latest, ubuntu-latest]
 
     steps:
     - name: Checkout
@@ -20,10 +20,12 @@ jobs:
         submodules: true
         fetch-depth: 0
 
-    - name: Install .NET 7.0
-      uses: actions/setup-dotnet@v3
+    - name: Install .NET 6 & 8
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: '7.0.x'
+        dotnet-version: |
+            6
+            8.
 
     - name: Build, Test, Pack, Publish
       shell: bash

src/Tomlyn.Tests/AssertHelper.cs

@@ -1,5 +1,5 @@
 // Copyright (c) Alexandre Mutel. All rights reserved.
-// Licensed under the BSD-Clause 2 license. 
+// Licensed under the BSD-Clause 2 license.
 // See license.txt file in the project root for full license information.
 
 using System;
@@ -27,5 +27,14 @@ public static string NormalizeEndOfLine(string text)
         {
             return text.Replace("\r\n", "\n");
         }
+
+        #if NET5_0_OR_GREATER
+        #else
+        public static string ReplaceLineEndings(this string text, string? newLine = null)
+        {
+            newLine ??= Environment.NewLine;
+            return text.Replace("\r\n", "\n").Replace("\n", newLine);
+        }
+        #endif
     }
 }

src/Tomlyn.Tests/Tomlyn.Tests.csproj

@@ -1,16 +1,28 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">net6.0;net8.0;net48</TargetFrameworks>
+    <TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">net6.0;net8.0</TargetFrameworks>
+  </PropertyGroup>
+
+  <PropertyGroup>
     <IsPackable>false</IsPackable>
     <Nullable>enable</Nullable>
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="nunit" Version="3.14.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="System.Text.Json" Version="8.0.1" />
+    <PackageReference Include="Portable.System.DateTimeOnly" Version="8.0.0" Condition="'$(TargetFramework)' == 'net48'" />
+    <PackageReference Include="Microsoft.Bcl.HashCode" Version="1.1.1" Condition="'$(TargetFramework)' == 'net48'" />
+    <PackageReference Include="PolySharp" Version="1.*">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>

src/Tomlyn/Tomlyn.csproj

@@ -2,6 +2,7 @@
   <Import Project="Tomlyn.props" />
   <PropertyGroup>
     <PackageId>Tomlyn</PackageId>
+    <TargetFrameworks>netstandard2.0;net6.0;net8.0</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
     <Folder Include="Compatibility\" />

src/Tomlyn/Tomlyn.props

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net7.0</TargetFrameworks>
+
     <LangVersion>latest</LangVersion>
     <Description>Tomlyn is a TOML parser, validator and authoring library for .NET.</Description>
     <Copyright>Alexandre Mutel</Copyright>

src/global.json

@@ -1,7 +1,7 @@
 {
-    "sdk": {
-        "version": "7.0.100",
-        "rollForward": "latestMinor",
-        "allowPrerelease": false
-    }
+  "sdk": {
+    "version": "8.0.0",
+    "rollForward": "latestMinor",
+    "allowPrerelease": false
+  }
 }