Apply eval abort test fix for CLR 8.0.
authorMikhail Kurinnoi <m.kurinnoi@samsung.com>
Wed, 20 Sep 2023 14:22:39 +0000 (17:22 +0300)
committerGleb Balykov/Advanced System SW Lab /SRR/Staff Engineer/Samsung Electronics <g.balykov@samsung.com>
Tue, 26 Sep 2023 08:27:01 +0000 (17:27 +0900)
Related to https://github.com/dotnet/runtime/issues/82422

test-suite/MITestVariables/Program.cs
test-suite/VSCodeTestVariables/Program.cs

index 0a47e3ac64294b519e215616e24783ac821a3d02..71313da1e8c53325beede13b53bbc61637c9521e 100644 (file)
@@ -458,9 +458,10 @@ namespace MITestVariables
         {
             get
             {
-                // CoreCLR 7.0 have issue with abortable internal native code.
+                // CoreCLR 7.0 and 8.0 have issue with abortable internal native code.
                 // https://github.com/dotnet/runtime/issues/82422
-                if (System.Environment.Version.Major == 7)
+                if (System.Environment.Version.Major == 7 ||
+                    System.Environment.Version.Major == 8)
                 {
                     while (true)
                     {
index 6147225389145ce905025a3d4f6d6d7a85760b6c..21a9079429ece75376f61b5b423f2b2ad1867cec 100644 (file)
@@ -554,9 +554,10 @@ namespace VSCodeTestVariables
         {
             get
             {
-                // CoreCLR 7.0 have issue with abortable internal native code.
+                // CoreCLR 7.0 and 8.0 have issue with abortable internal native code.
                 // https://github.com/dotnet/runtime/issues/82422
-                if (System.Environment.Version.Major == 7)
+                if (System.Environment.Version.Major == 7 ||
+                    System.Environment.Version.Major == 8)
                 {
                     while (true)
                     {