From 9dab17518e1816500e711781160b8302cb9b9d56 Mon Sep 17 00:00:00 2001
From: Joseph Myers <wjosephmyers@gmail.com>
Date: Thu, 3 Oct 2024 16:57:15 +0700
Subject: [PATCH] Added .NET8 tests for SIL.Core

---
 .../Acknowledgements/AcknowledgementAttributeTests.cs     | 4 ++--
 SIL.Core.Tests/PlatformUtilities/PlatformTests.cs         | 8 ++++----
 SIL.Core.Tests/Progress/ConsoleProgressTests.cs           | 6 ++++++
 SIL.Core.Tests/SIL.Core.Tests.csproj                      | 1 +
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/SIL.Core.Tests/Acknowledgements/AcknowledgementAttributeTests.cs b/SIL.Core.Tests/Acknowledgements/AcknowledgementAttributeTests.cs
index 016eb555e..669306130 100644
--- a/SIL.Core.Tests/Acknowledgements/AcknowledgementAttributeTests.cs
+++ b/SIL.Core.Tests/Acknowledgements/AcknowledgementAttributeTests.cs
@@ -46,8 +46,8 @@ public string CreateAnAcknowledgement_TestDefaultHtml(string key, string name, s
 		public void CreateAnAcknowledgement_NoCopyright_OverriddenByFile()
 		{
 			var ack = new AcknowledgementAttribute("testKey") { Name = "testName",
-				Location = GetDllWithPathInTestAssemblyFolder("NDesk.DBus.dll") } ;
-			Assert.That(ack.Copyright, Is.EqualTo("Copyright (C) Alp Toker"));
+				Location = GetDllWithPathInTestAssemblyFolder("nunit.framework.dll") } ;
+			Assert.That(ack.Copyright, Is.EqualTo("Copyright (c) 2022 Charlie Poole, Rob Prouse"));
 		}
 
 		[Test]
diff --git a/SIL.Core.Tests/PlatformUtilities/PlatformTests.cs b/SIL.Core.Tests/PlatformUtilities/PlatformTests.cs
index cd429ee1b..7daf1dc8c 100644
--- a/SIL.Core.Tests/PlatformUtilities/PlatformTests.cs
+++ b/SIL.Core.Tests/PlatformUtilities/PlatformTests.cs
@@ -12,28 +12,28 @@ namespace SIL.Tests.PlatformUtilities
 	public class PlatformTests
 	{
 		[Test]
-		[Platform(Exclude="Net")]
+		[Platform(Exclude="Net,NetCore")]
 		public void IsMono_Mono()
 		{
 			Assert.That(Platform.IsMono, Is.True);
 		}
 
 		[Test]
-		[Platform(Include="Net")]
+		[Platform(Include="Net,NetCore")]
 		public void IsMono_Net()
 		{
 			Assert.That(Platform.IsMono, Is.False);
 		}
 
 		[Test]
-		[Platform(Exclude="Net")]
+		[Platform(Exclude="Net,NetCore")]
 		public void IsDotnet_Mono()
 		{
 			Assert.That(Platform.IsDotNet, Is.False);
 		}
 
 		[Test]
-		[Platform(Include="Net")]
+		[Platform(Include="Net,NetCore")]
 		public void IsDotnet_Net()
 		{
 			Assert.That(Platform.IsDotNet, Is.True);
diff --git a/SIL.Core.Tests/Progress/ConsoleProgressTests.cs b/SIL.Core.Tests/Progress/ConsoleProgressTests.cs
index cb60c9434..0a451519b 100644
--- a/SIL.Core.Tests/Progress/ConsoleProgressTests.cs
+++ b/SIL.Core.Tests/Progress/ConsoleProgressTests.cs
@@ -22,6 +22,12 @@ public void Setup()
 			_countForWork = 0;
 		}
 
+		[TearDown]
+		public void TearDown()
+		{
+			_logBuilder.Dispose();
+		}
+
 		[Test]
 		[Category("ByHand")]
 		[Explicit]
diff --git a/SIL.Core.Tests/SIL.Core.Tests.csproj b/SIL.Core.Tests/SIL.Core.Tests.csproj
index 04becc466..d764692fa 100644
--- a/SIL.Core.Tests/SIL.Core.Tests.csproj
+++ b/SIL.Core.Tests/SIL.Core.Tests.csproj
@@ -5,6 +5,7 @@
     <AssemblyName>SIL.Core.Tests</AssemblyName>
     <Description>Unit tests for SIL.Core</Description>
     <AddSyntheticProjectReferencesForSolutionDependencies>false</AddSyntheticProjectReferencesForSolutionDependencies>
+    <TargetFrameworks>$(TargetFrameworks);net8.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>