[API] OperatingSystem.IsWasi() (#82817)

implement approved API #78389
dotnet · Mar 1, 2023 · 3d160bc · 3d160bc
1 parent 7bb7265
commit 3d160bc
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/src/libraries/System.Private.CoreLib/src/System/OperatingSystem.cs b/src/libraries/System.Private.CoreLib/src/System/OperatingSystem.cs
@@ -150,7 +150,6 @@ public static bool IsOSPlatformVersionAtLeast(string platform, int major, int mi
             false;
 #endif
 
-/* TODO https://github.com/dotnet/runtime/issues/78389
         /// <summary>
         /// Indicates whether the current application is running as WASI.
         /// </summary>
@@ -161,7 +160,6 @@ public static bool IsOSPlatformVersionAtLeast(string platform, int major, int mi
 #else
             false;
 #endif
-*/
 
         /// <summary>
         /// Indicates whether the current application is running on Linux.

diff --git a/src/libraries/System.Runtime.Extensions/tests/System/OperatingSystemTests.cs b/src/libraries/System.Runtime.Extensions/tests/System/OperatingSystemTests.cs
@@ -18,7 +18,8 @@ public static class OperatingSystemTests
             "Windows",
             "Linux",
             "FreeBSD",
-            "Browser"
+            "Browser",
+            "Wasi",
         };
 
         [Theory]
@@ -80,6 +81,12 @@ public static void IsOSPlatformVersionAtLeast_InvalidArgs_Throws()
         [Fact, PlatformSpecific(TestPlatforms.Browser)]
         public static void TestIsOSVersionAtLeast_Browser() => TestIsOSVersionAtLeast("BROWSER");
 
+        [Fact, PlatformSpecific(TestPlatforms.Wasi)]
+        public static void TestIsOSPlatform_Wasi() => TestIsOSPlatform("WASI", OperatingSystem.IsWasi);
+
+        [Fact, PlatformSpecific(TestPlatforms.Wasi)]
+        public static void TestIsOSVersionAtLeast_Wasi() => TestIsOSVersionAtLeast("WASI");
+
         [Fact, PlatformSpecific(TestPlatforms.Linux)]
         public static void TestIsOSPlatform_Linux() => TestIsOSPlatform("Linux", OperatingSystem.IsLinux);
 
@@ -191,7 +198,8 @@ private static void TestIsOSPlatform(string currentOSName, Func<bool> currentOSC
                 OperatingSystem.IsMacOS(),
                 OperatingSystem.IsTvOS(),
                 OperatingSystem.IsWatchOS(),
-                OperatingSystem.IsWindows()
+                OperatingSystem.IsWindows(),
+                OperatingSystem.IsWasi(),
             };
 
             // MacCatalyst is a special case since it also returns true for iOS
@@ -208,6 +216,7 @@ private static void TestIsOSPlatform(string currentOSName, Func<bool> currentOSC
                 Assert.False(allResults[7]); // IsTvOS()
                 Assert.False(allResults[8]); // IsWatchOS()
                 Assert.False(allResults[9]); // IsWindows()
+                Assert.False(allResults[10]); // IsWasi()
             }
             else
             {

diff --git a/src/libraries/System.Runtime/ref/System.Runtime.cs b/src/libraries/System.Runtime/ref/System.Runtime.cs
@@ -4334,6 +4334,7 @@ public sealed partial class OperatingSystem : System.ICloneable, System.Runtime.
         public static bool IsAndroid() { throw null; }
         public static bool IsAndroidVersionAtLeast(int major, int minor = 0, int build = 0, int revision = 0) { throw null; }
         public static bool IsBrowser() { throw null; }
+        public static bool IsWasi() { throw null; }
         public static bool IsFreeBSD() { throw null; }
         public static bool IsFreeBSDVersionAtLeast(int major, int minor = 0, int build = 0, int revision = 0) { throw null; }
         [System.Runtime.Versioning.SupportedOSPlatformGuardAttribute("maccatalyst")]