Remove IsWatchOS checks for consistency

src/libraries/Common/src/Interop/Unix/Interop.Odbc.cs

@@ -16,7 +16,7 @@ internal static partial class Odbc
     {
         internal static string GetNativeLibraryName()
         {
-            if (OperatingSystem.IsMacOS() || OperatingSystem.IsIOS() || OperatingSystem.IsTvOS() || OperatingSystem.IsWatchOS())
+            if (OperatingSystem.IsMacOS() || OperatingSystem.IsIOS() || OperatingSystem.IsTvOS())
             {
                 return "libodbc.2.dylib";
             }

src/libraries/Common/src/System/IO/PathInternal.CaseSensitivity.cs

@@ -24,7 +24,7 @@ internal static bool IsCaseSensitive
         {
             get
             {
-                return !(OperatingSystem.IsWindows() || OperatingSystem.IsMacOS() || OperatingSystem.IsIOS() || OperatingSystem.IsTvOS() || OperatingSystem.IsWatchOS());
+                return !(OperatingSystem.IsWindows() || OperatingSystem.IsMacOS() || OperatingSystem.IsIOS() || OperatingSystem.IsTvOS());
             }
         }
     }

src/libraries/System.Net.Ping/tests/FunctionalTests/PingTest.cs

@@ -78,7 +78,7 @@ private static byte[] GetPingPayload(AddressFamily addressFamily)
                 : Array.Empty<byte>();
 
         public static bool DoesNotUsePingUtility => OperatingSystem.IsWindows() ||
-                                OperatingSystem.IsMacOS() || OperatingSystem.IsMacCatalyst() || OperatingSystem.IsWatchOS() || OperatingSystem.IsIOS() || OperatingSystem.IsTvOS() ||
+                                OperatingSystem.IsMacOS() || OperatingSystem.IsMacCatalyst() || OperatingSystem.IsIOS() || OperatingSystem.IsTvOS() ||
                                 Capability.CanUseRawSockets(TestSettings.GetLocalIPAddress().AddressFamily);
         public static bool UsesPingUtility => !DoesNotUsePingUtility;
 

src/libraries/System.Net.Quic/src/System/Net/Quic/Interop/msquic.cs

@@ -148,7 +148,7 @@ internal struct QuicAddr
         [FieldOffset(0)]
         public QuicAddrFamilyAndLen FamilyLen;
 
-        public static bool SockaddrHasLength => OperatingSystem.IsFreeBSD() || OperatingSystem.IsIOS() || OperatingSystem.IsMacOS() || OperatingSystem.IsMacCatalyst() || OperatingSystem.IsTvOS() || OperatingSystem.IsWatchOS();
+        public static bool SockaddrHasLength => OperatingSystem.IsFreeBSD() || OperatingSystem.IsIOS() || OperatingSystem.IsMacOS() || OperatingSystem.IsMacCatalyst() || OperatingSystem.IsTvOS();
 
         public int Family
         {

src/libraries/System.Private.CoreLib/src/System/Globalization/GlobalizationMode.Unix.cs

@@ -39,7 +39,7 @@ private static string GetIcuLoadFailureMessage()
             {
                 // These strings can't go into resources, because a resource lookup requires globalization, which requires ICU
                 if (OperatingSystem.IsBrowser() || OperatingSystem.IsWasi() || OperatingSystem.IsAndroid() ||
-                    OperatingSystem.IsIOS() || OperatingSystem.IsTvOS() || OperatingSystem.IsWatchOS())
+                    OperatingSystem.IsIOS() || OperatingSystem.IsTvOS())
                 {
                     return "Unable to load required ICU Globalization data. Please see https://aka.ms/dotnet-missing-libicu for more information";
                 }

src/libraries/System.Runtime/tests/System.Runtime.Extensions.Tests/System/OperatingSystemTests.cs

@@ -198,7 +198,6 @@ private static void TestIsOSPlatform(string currentOSName, Func<bool> currentOSC
                 { "IsMacCatalyst", OperatingSystem.IsMacCatalyst() },
                 { "IsMacOS", OperatingSystem.IsMacOS() },
                 { "IsTvOS", OperatingSystem.IsTvOS() },
-                { "IsWatchOS", OperatingSystem.IsWatchOS() },
                 { "IsWindows", OperatingSystem.IsWindows() },
                 { "IsWasi", OperatingSystem.IsWasi() },
             };

src/tests/Common/CoreCLRTestLibrary/PlatformDetection.cs

@@ -63,7 +63,7 @@ public static bool IsNonZeroLowerBoundArraySupported
 
         // These platforms have not had their infrastructure updated to support native test assets.
         public static bool PlatformDoesNotSupportNativeTestAssets =>
-            OperatingSystem.IsIOS() || OperatingSystem.IsTvOS() || OperatingSystem.IsWatchOS() || OperatingSystem.IsAndroid() || OperatingSystem.IsBrowser() || OperatingSystem.IsWasi();
-        public static bool IsAppleMobile => OperatingSystem.IsIOS() || OperatingSystem.IsTvOS() || OperatingSystem.IsWatchOS() || OperatingSystem.IsMacCatalyst();
+            OperatingSystem.IsIOS() || OperatingSystem.IsTvOS() || OperatingSystem.IsAndroid() || OperatingSystem.IsBrowser() || OperatingSystem.IsWasi();
+        public static bool IsAppleMobile => OperatingSystem.IsIOS() || OperatingSystem.IsTvOS() || OperatingSystem.IsMacCatalyst();
     }
 }

src/tests/Common/XHarnessRunnerLibrary/RunnerEntryPoint.cs

@@ -28,7 +28,7 @@ public static async Task<int> RunTests(
         {
             entryPoint = new AndroidEntryPoint(new SimpleDevice(assemblyName), runTestsCallback, assemblyName, filter, testExclusionTable);
         }
-        if (OperatingSystem.IsMacCatalyst() || OperatingSystem.IsIOS() || OperatingSystem.IsTvOS() || OperatingSystem.IsWatchOS())
+        if (OperatingSystem.IsMacCatalyst() || OperatingSystem.IsIOS() || OperatingSystem.IsTvOS())
         {
             entryPoint = new AppleEntryPoint(new SimpleDevice(assemblyName), runTestsCallback, assemblyName, filter, testExclusionTable);
         }