Fix not to use Thread.CurrentThread in net8.0

y-iihoshi · Dec 9, 2023 · de6365b · de6365b
1 parent 9153417
commit de6365b
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/ThScoreFileConverter.Tests/UnitTesting/STATestMethodAttribute.cs b/ThScoreFileConverter.Tests/UnitTesting/STATestMethodAttribute.cs
@@ -6,8 +6,13 @@ public sealed class STATestMethodAttribute : TestMethodAttribute
 {
     public override TestResult[] Execute(ITestMethod testMethod)
     {
+#if NET8_0_OR_GREATER
+        // Although the root cause is unknown, accessing Thread.CurrentThread
+        // might raise System.NullReferenceException in net8.0.
+#else
         if (Thread.CurrentThread.GetApartmentState() == ApartmentState.STA)
             return base.Execute(testMethod);
+#endif
 
         TestResult[]? result = null;
         var thread = new Thread(() => result = base.Execute(testMethod));