.

Author: jamescrosswell

test/Sentry.Profiling.Tests/SamplingTransactionProfilerTests.cs

@@ -117,8 +117,11 @@ private SampleProfile CaptureAndValidate(ITransactionProfilerFactory factory)
     [SkippableFact]
     public void Profiler_WithZeroStartupTimeout_CapturesAfterStartingAsynchronously()
     {
-        Skip.If(TestEnvironment.IsGitHubActions && (TestEnvironment.IsWinX64 || RuntimeInformation.IsOSPlatform(OSPlatform.Linux)),
-            "Flaky in CI on Windows X64 and Linux.");
+        if (TestEnvironment.IsGitHubActions)
+        {
+            Skip.If(TestEnvironment.IsWinX64, "Flaky in CI on Windows X64.");
+            Skip.If(RuntimeInformation.IsOSPlatform(OSPlatform.Linux), "Flaky in CI on Linux.");
+        }
 
         using var factory = new SamplingTransactionProfilerFactory(_testSentryOptions, TimeSpan.Zero);
         var profiler = factory.Start(new TransactionTracer(Substitute.For<IHub>(), "test", ""), CancellationToken.None);

test/Sentry.Testing/TestEnvironment.cs

@@ -16,6 +16,6 @@ public static bool IsGitHubActions
         }
     }
 
-    public static bool IsWinX64 => RuntimeInformation.OSArchitecture == Architecture.X64
-                                   && RuntimeInformation.OSDescription.Contains("Windows");
+    public static bool IsWinX64 => RuntimeInformation.IsOSPlatform(OSPlatform.Windows)
+                                   && RuntimeInformation.OSArchitecture == Architecture.X64;
 }