From 715364fb1eefa4b4beede3f7565bf5fe195e8cd4 Mon Sep 17 00:00:00 2001
From: Ben Olden-Cooligan <ben.cyanfish@gmail.com>
Date: Tue, 20 Aug 2024 18:45:40 -0700
Subject: [PATCH] Fix test targets for net9

---
 NAPS2.App.Tests/AppTestData.cs                              | 4 ++--
 NAPS2.App.Tests/Appium/AppiumTestData.cs                    | 4 ++--
 .../{WinNet462AppTestTarget.cs => WindowsAppTestTarget.cs}  | 6 +++---
 NAPS2.Tools/Project/TestCommand.cs                          | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename NAPS2.App.Tests/Targets/{WinNet462AppTestTarget.cs => WindowsAppTestTarget.cs} (81%)

diff --git a/NAPS2.App.Tests/AppTestData.cs b/NAPS2.App.Tests/AppTestData.cs
index ac87ff51a6..8e45faeb0e 100644
--- a/NAPS2.App.Tests/AppTestData.cs
+++ b/NAPS2.App.Tests/AppTestData.cs
@@ -10,7 +10,7 @@ public IEnumerator<object[]> GetEnumerator()
 #if NET6_0_OR_GREATER
         if (OperatingSystem.IsWindows())
         {
-            yield return new object[] { new WinNet462AppTestTarget() };
+            yield return new object[] { new WindowsAppTestTarget() };
         }
         else if (OperatingSystem.IsMacOS())
         {
@@ -21,7 +21,7 @@ public IEnumerator<object[]> GetEnumerator()
             yield return new object[] { new LinuxAppTestTarget() };
         }
 #else
-        yield return new object[] { new WinNet462AppTestTarget() };
+        yield return new object[] { new WindowsAppTestTarget() };
 #endif
     }
 
diff --git a/NAPS2.App.Tests/Appium/AppiumTestData.cs b/NAPS2.App.Tests/Appium/AppiumTestData.cs
index ddde7bb1cc..8b8a6f3be9 100644
--- a/NAPS2.App.Tests/Appium/AppiumTestData.cs
+++ b/NAPS2.App.Tests/Appium/AppiumTestData.cs
@@ -10,7 +10,7 @@ public IEnumerator<object[]> GetEnumerator()
 #if NET6_0_OR_GREATER
         if (OperatingSystem.IsWindows())
         {
-            yield return new object[] { new WinNet462AppTestTarget() };
+            yield return new object[] { new WindowsAppTestTarget() };
         }
         else if (OperatingSystem.IsMacOS())
         {
@@ -21,7 +21,7 @@ public IEnumerator<object[]> GetEnumerator()
             // No Appium impl yet
         }
 #else
-        yield return new object[] { new WinNet462AppTestTarget() };
+        yield return new object[] { new WindowsAppTestTarget() };
 #endif
     }
 
diff --git a/NAPS2.App.Tests/Targets/WinNet462AppTestTarget.cs b/NAPS2.App.Tests/Targets/WindowsAppTestTarget.cs
similarity index 81%
rename from NAPS2.App.Tests/Targets/WinNet462AppTestTarget.cs
rename to NAPS2.App.Tests/Targets/WindowsAppTestTarget.cs
index 73d8f4973e..14be7b2dec 100644
--- a/NAPS2.App.Tests/Targets/WinNet462AppTestTarget.cs
+++ b/NAPS2.App.Tests/Targets/WindowsAppTestTarget.cs
@@ -1,6 +1,6 @@
 namespace NAPS2.App.Tests.Targets;
 
-public class WinNet462AppTestTarget : IAppTestTarget
+public class WindowsAppTestTarget : IAppTestTarget
 {
     public AppTestExe Console => GetAppTestExe("NAPS2.App.Console", "NAPS2.Console.exe", null);
     public AppTestExe Gui => GetAppTestExe("NAPS2.App.WinForms", "NAPS2.exe", null);
@@ -10,10 +10,10 @@ public class WinNet462AppTestTarget : IAppTestTarget
     private AppTestExe GetAppTestExe(string project, string exeName, string testRootSubPath)
     {
         return new AppTestExe(
-            Path.Combine(AppTestHelper.SolutionRoot, project, "bin", "Debug", "net462"),
+            Path.Combine(AppTestHelper.SolutionRoot, project, "bin", "Debug", "met9-windows"),
             exeName,
             TestRootSubPath: testRootSubPath);
     }
 
-    public override string ToString() => "Windows (net462)";
+    public override string ToString() => "Windows";
 }
\ No newline at end of file
diff --git a/NAPS2.Tools/Project/TestCommand.cs b/NAPS2.Tools/Project/TestCommand.cs
index 0031d9ae27..bcd3b911a5 100644
--- a/NAPS2.Tools/Project/TestCommand.cs
+++ b/NAPS2.Tools/Project/TestCommand.cs
@@ -11,7 +11,7 @@ public int Run(TestOptions opts)
             ? $"NAPS2.App.Mac/bin/Debug/net8-macos10.15/osx-{arch}"
             : OperatingSystem.IsLinux()
                 ? $"NAPS2.App.Gtk/bin/Debug/net8/linux-{arch}"
-                : "NAPS2.App.WinForms/bin/Debug/net462";
+                : $"NAPS2.App.WinForms/bin/Debug/net9-windows/win-{arch}";
         var frameworkArg = OperatingSystem.IsWindows() ? "" : "-f net8";
 
         void RunTests(string project, bool isRetry = false)