new WASI RID (#11641)

* new WASI RID
dotnet · Nov 16, 2022 · d2adb82 · d2adb82
1 parent 1446801
commit d2adb82
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/src/Microsoft.DotNet.RemoteExecutor/src/RemoteExecutor.cs b/src/Microsoft.DotNet.RemoteExecutor/src/RemoteExecutor.cs
@@ -103,6 +103,7 @@ private static bool IsNetCore() =>
             !RuntimeInformation.IsOSPlatform(OSPlatform.Create("MACCATALYST")) &&
             !RuntimeInformation.IsOSPlatform(OSPlatform.Create("WATCHOS")) &&
             !RuntimeInformation.IsOSPlatform(OSPlatform.Create("BROWSER")) &&
+            !RuntimeInformation.IsOSPlatform(OSPlatform.Create("WASI")) &&
             // The current RemoteExecutor design is not compatible with single file
             !string.IsNullOrEmpty(typeof(RemoteExecutor).Assembly.Location) &&
             Environment.GetEnvironmentVariable("DOTNET_REMOTEEXECUTOR_SUPPORTED") != "0";

diff --git a/src/Microsoft.DotNet.XUnitExtensions/src/DiscovererHelpers.cs b/src/Microsoft.DotNet.XUnitExtensions/src/DiscovererHelpers.cs
@@ -31,6 +31,7 @@ public static bool TestPlatformApplies(TestPlatforms platforms) =>
                 (platforms.HasFlag(TestPlatforms.LinuxBionic) && RuntimeInformation.IsOSPlatform(OSPlatform.Linux)) && !String.IsNullOrEmpty(Environment.GetEnvironmentVariable("ANDROID_STORAGE")) ||
                 (platforms.HasFlag(TestPlatforms.Android) && RuntimeInformation.IsOSPlatform(OSPlatform.Create("ANDROID"))) ||
                 (platforms.HasFlag(TestPlatforms.Browser) && RuntimeInformation.IsOSPlatform(OSPlatform.Create("BROWSER"))) ||
+                (platforms.HasFlag(TestPlatforms.Wasi) && RuntimeInformation.IsOSPlatform(OSPlatform.Create("WASI"))) ||
                 (platforms.HasFlag(TestPlatforms.Windows) && RuntimeInformation.IsOSPlatform(OSPlatform.Windows));
 
         public static bool TestRuntimeApplies(TestRuntimes runtimes) =>

diff --git a/src/Microsoft.DotNet.XUnitExtensions/src/TestPlatforms.cs b/src/Microsoft.DotNet.XUnitExtensions/src/TestPlatforms.cs
@@ -21,7 +21,8 @@ public enum TestPlatforms
         Browser = 1024,
         MacCatalyst = 2048,
         LinuxBionic = 4096,
-        AnyUnix = FreeBSD | Linux | NetBSD | OSX | illumos | Solaris | iOS | tvOS | MacCatalyst | Android | Browser | LinuxBionic,
+        Wasi = 8192,
+        AnyUnix = FreeBSD | Linux | NetBSD | OSX | illumos | Solaris | iOS | tvOS | MacCatalyst | Android | Browser | LinuxBionic | Wasi,
         Any = ~0
     }
 }