From 3f8fe62d5e030acae7b2b470aa5627b68c27a15f Mon Sep 17 00:00:00 2001
From: josephmyers <43733878+josephmyers@users.noreply.github.com>
Date: Thu, 17 Oct 2024 13:04:15 +0700
Subject: [PATCH] .NET8 SIL.Core.Tests (#1348)

---
 SIL.Core.Desktop.Tests/SIL.Core.Desktop.Tests.csproj      | 4 ----
 .../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                      | 2 ++
 .../SynchronousProcessOutputReader.cs                     | 4 ++--
 .../CommandLineRunnerTestApp.csproj                       | 3 +--
 7 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/SIL.Core.Desktop.Tests/SIL.Core.Desktop.Tests.csproj b/SIL.Core.Desktop.Tests/SIL.Core.Desktop.Tests.csproj
index 1bbb54a7d..e917a7d12 100644
--- a/SIL.Core.Desktop.Tests/SIL.Core.Desktop.Tests.csproj
+++ b/SIL.Core.Desktop.Tests/SIL.Core.Desktop.Tests.csproj
@@ -22,8 +22,4 @@
     <ProjectReference Include="..\SIL.TestUtilities\SIL.TestUtilities.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Reference Include="Microsoft.CSharp" />
-  </ItemGroup>
-
 </Project>
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..a88ce7b78 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>
@@ -20,6 +21,7 @@
     <ProjectReference Include="..\SIL.Core\SIL.Core.csproj" />
     <ProjectReference Include="..\SIL.TestUtilities\SIL.TestUtilities.csproj" />
     <ProjectReference Include="..\SIL.WritingSystems\SIL.WritingSystems.csproj" />
+    <ProjectReference Include="..\TestApps\CommandLineRunnerTestApp\CommandLineRunnerTestApp.csproj" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/SIL.Core/CommandLineProcessing/SynchronousProcessOutputReader.cs b/SIL.Core/CommandLineProcessing/SynchronousProcessOutputReader.cs
index d75c872c1..584e5f6eb 100644
--- a/SIL.Core/CommandLineProcessing/SynchronousProcessOutputReader.cs
+++ b/SIL.Core/CommandLineProcessing/SynchronousProcessOutputReader.cs
@@ -73,9 +73,9 @@ public override bool Read(int secondsBeforeTimeOut)
 				if (secondsBeforeTimeOut>0 && DateTime.Now > end)
 				{
 					if (_outputReader != null)
-						_outputReader.Abort();
+						_outputReader.Interrupt();
 					if (_errorReader != null)
-						_errorReader.Abort();
+						_errorReader.Interrupt();
 					return false;
 				}
 			}
diff --git a/TestApps/CommandLineRunnerTestApp/CommandLineRunnerTestApp.csproj b/TestApps/CommandLineRunnerTestApp/CommandLineRunnerTestApp.csproj
index db8b0b4b3..2639bea5f 100644
--- a/TestApps/CommandLineRunnerTestApp/CommandLineRunnerTestApp.csproj
+++ b/TestApps/CommandLineRunnerTestApp/CommandLineRunnerTestApp.csproj
@@ -4,9 +4,8 @@
     <RootNamespace>SIL.CommandLineProcessing.TestApp</RootNamespace>
     <AssemblyName>SIL.CommandLineProcessing.TestApp</AssemblyName>
     <Description>SIL.CommandLineProcessing test app</Description>
-    <OutputPath>../../output/$(Configuration)</OutputPath>
     <IsPackable>false</IsPackable>
-    <UseWindowsForms>true</UseWindowsForms>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworks>$(TargetFrameworks);net8.0</TargetFrameworks>
   </PropertyGroup>
 </Project>