Use OperatingSystem APIs instead of RuntimeInformation in more places (…

…#52548) * Use OperatingSystem APIs instead of RuntimeInformation in more places These are recommended instead of the older APIs. * PR feedback
dotnet · May 18, 2021 · 4a73cb9 · 4a73cb9
1 parent e426e2c
commit 4a73cb9
Show file tree

Hide file tree

Showing 75 changed files with 191 additions and 352 deletions.
diff --git a/...installer/tests/HostActivation.Tests/DependencyResolution/ResolveComponentDependencies.cs b/...installer/tests/HostActivation.Tests/DependencyResolution/ResolveComponentDependencies.cs
@@ -74,7 +74,7 @@ public void ComponentWithNoDependenciesCaseChangedOnAsm()
             // Rename
             File.Move(fileName, changeFile);
 
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            if (OperatingSystem.IsWindows())
             {
                 sharedTestState.RunComponentResolutionTest(component)
                     .Should().Pass()
@@ -84,7 +84,7 @@ public void ComponentWithNoDependenciesCaseChangedOnAsm()
                     .And.HaveStdErrContaining($"deps='{component.DepsJson}'")
                     .And.HaveStdErrContaining($"mgd_app='{component.AppDll}'");
             }
-            else if(RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+            else if(OperatingSystem.IsMacOS())
             {
                 sharedTestState.RunComponentResolutionTest(component)
                     .Should().Pass()
@@ -131,7 +131,7 @@ public void ComponentWithNoDependenciesCaseChangedOnDepsAndAsm()
             File.Move(fileName, changeFile);
             File.Move(component.DepsJson, changeDepsFile);
 
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            if (OperatingSystem.IsWindows())
             {
                 sharedTestState.RunComponentResolutionTest(component)
                     .Should().Pass()
@@ -141,7 +141,7 @@ public void ComponentWithNoDependenciesCaseChangedOnDepsAndAsm()
                     .And.HaveStdErrContaining($"deps='{component.DepsJson}'")
                     .And.HaveStdErrContaining($"mgd_app='{component.AppDll}'");
             }
-            else if(RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+            else if(OperatingSystem.IsMacOS())
             {
                 sharedTestState.RunComponentResolutionTest(component)
                     .Should().Pass()
@@ -189,7 +189,7 @@ public void ComponentWithNoDependenciesNoDepsCaseChangedOnAsm()
             // Delete deps
             File.Delete(component.DepsJson);
 
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            if (OperatingSystem.IsWindows())
             {
                 sharedTestState.RunComponentResolutionTest(component)
                     .Should().Pass()
@@ -199,7 +199,7 @@ public void ComponentWithNoDependenciesNoDepsCaseChangedOnAsm()
                     .And.HaveStdErrContaining($"deps='{component.DepsJson}'")
                     .And.HaveStdErrContaining($"mgd_app='{component.AppDll}'");
             }
-            else if(RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+            else if(OperatingSystem.IsMacOS())
             {
                 sharedTestState.RunComponentResolutionTest(component)
                     .Should().Pass()

diff --git a/src/installer/tests/HostActivation.Tests/FrameworkResolution/MultipleHives.cs b/src/installer/tests/HostActivation.Tests/FrameworkResolution/MultipleHives.cs
@@ -21,44 +21,29 @@ public MultipleHives(SharedTestState sharedState)
         }
 
         [Fact]
+        [PlatformSpecific(TestPlatforms.Windows)] // Multiple hives are only supported on Windows.
         public void FrameworkHiveSelection_GlobalHiveWithBetterMatch()
         {
-            if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-            {
-                // Multiple hives are only supported on Windows.
-                return;
-            }
-
             RunTest(
                 runtimeConfig => runtimeConfig
                     .WithFramework(MicrosoftNETCoreApp, "5.0.0"))
                 .ShouldHaveResolvedFramework(MicrosoftNETCoreApp, "5.1.2");
         }
 
         [Fact]
+        [PlatformSpecific(TestPlatforms.Windows)] // Multiple hives are only supported on Windows.
         public void FrameworkHiveSelection_MainHiveWithBetterMatch()
         {
-            if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-            {
-                // Multiple hives are only supported on Windows.
-                return;
-            }
-
             RunTest(
                 runtimeConfig => runtimeConfig
                     .WithFramework(MicrosoftNETCoreApp, "6.0.0"))
                 .ShouldHaveResolvedFramework(MicrosoftNETCoreApp, "6.1.2");
         }
 
         [Fact]
+        [PlatformSpecific(TestPlatforms.Windows)] // Multiple hives are only supported on Windows.
         public void FrameworkHiveSelection_CurrentDirectoryIsIgnored()
         {
-            if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-            {
-                // Multiple hives are only supported on Windows.
-                return;
-            }
-
             RunTest(
                 SharedState.DotNetMainHive,
                 SharedState.FrameworkReferenceApp,

diff --git a/src/installer/tests/HostActivation.Tests/HostVersionCompatibility.cs b/src/installer/tests/HostActivation.Tests/HostVersionCompatibility.cs
@@ -138,9 +138,9 @@ private static bool IsRidSupported()
         {
             // Some current Linux RIDs are not supported in 2.0\2.1; just test for Ubuntu 16.
             return (
-                RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ||
-                RuntimeInformation.IsOSPlatform(OSPlatform.OSX) ||
-                (RuntimeInformation.IsOSPlatform(OSPlatform.Linux) && RuntimeInformation.RuntimeIdentifier == "ubuntu.16.04-x64")
+                OperatingSystem.IsWindows() ||
+                OperatingSystem.IsMacOS() ||
+                (OperatingSystem.IsLinux() && RuntimeInformation.RuntimeIdentifier == "ubuntu.16.04-x64")
             );
         }
 

diff --git a/src/installer/tests/HostActivation.Tests/MultilevelSDKLookup.cs b/src/installer/tests/HostActivation.Tests/MultilevelSDKLookup.cs
@@ -89,14 +89,9 @@ public void Dispose()
         }
 
         [Fact]
+        [PlatformSpecific(TestPlatforms.Windows)] // Multi-level lookup is only supported on Windows.
         public void SdkMultilevelLookup_Global_Json_Single_Digit_Patch_Rollup()
         {
-            if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-            {
-                // Multi-level lookup is only supported on Windows.
-                return;
-            }
-
             // Set specified SDK version = 9999.3.4-global-dummy
             SetGlobalJsonVersion("SingleDigit-global.json");
 
@@ -264,14 +259,9 @@ public void SdkMultilevelLookup_Global_Json_Single_Digit_Patch_Rollup()
         }
 
         [Fact]
+        [PlatformSpecific(TestPlatforms.Windows)] // Multi-level lookup is only supported on Windows.
         public void SdkMultilevelLookup_Global_Json_Two_Part_Patch_Rollup()
         {
-            if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-            {
-                // Multi-level lookup is only supported on Windows.
-                return;
-            }
-
             // Set specified SDK version = 9999.3.304-global-dummy
             SetGlobalJsonVersion("TwoPart-global.json");
 
@@ -444,14 +434,9 @@ public void SdkMultilevelLookup_Global_Json_Two_Part_Patch_Rollup()
         }
 
         [Fact]
+        [PlatformSpecific(TestPlatforms.Windows)] // Multi-level lookup is only supported on Windows.
         public void SdkMultilevelLookup_Precedential_Order()
         {
-            if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-            {
-                // Multi-level lookup is only supported on Windows.
-                return;
-            }
-
             WriteEmptyGlobalJson();
 
             // Add SDK versions
@@ -498,6 +483,7 @@ public void SdkMultilevelLookup_Precedential_Order()
         }
 
         [Fact]
+        [PlatformSpecific(TestPlatforms.Windows)] // Multi-level lookup is only supported on Windows.
         public void SdkMultilevelLookup_RegistryAccess()
         {
             // The purpose of this test is to verify that the product uses correct code to access
@@ -511,12 +497,6 @@ public void SdkMultilevelLookup_RegistryAccess()
             // different registry key, inside the HKEY_CURRENT_USER hive which is writable without admin.
             // Note that the test creates a unique key (based on PID) for every run, to avoid collisions between parallel running tests.
 
-            if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-            {
-                // Multi-level lookup is only supported on Windows.
-                return;
-            }
-
             WriteEmptyGlobalJson();
 
             using (var registeredInstallLocationOverride = new RegisteredInstallLocationOverride(DotNet.GreatestVersionHostFxrFilePath))
@@ -547,14 +527,9 @@ public void SdkMultilevelLookup_RegistryAccess()
         }
 
         [Fact]
+        [PlatformSpecific(TestPlatforms.Windows)] // Multi-level lookup is only supported on Windows.
         public void SdkMultilevelLookup_Must_Pick_The_Highest_Semantic_Version()
         {
-            if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-            {
-                // Multi-level lookup is only supported on Windows.
-                return;
-            }
-
             WriteEmptyGlobalJson();
 
             // Add SDK versions

diff --git a/src/installer/tests/HostActivation.Tests/MultilevelSharedFxLookup.cs b/src/installer/tests/HostActivation.Tests/MultilevelSharedFxLookup.cs
@@ -129,14 +129,9 @@ public void Dispose()
         }
 
         [Fact]
+        [PlatformSpecific(TestPlatforms.Windows)] // Multi-level lookup is only supported on Windows.
         public void SharedMultilevelFxLookup_Must_Verify_Folders_in_the_Correct_Order()
         {
-            if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-            {
-                // Multi-level lookup is only supported on Windows.
-                return;
-            }
-
             var fixture = SharedFxLookupPortableAppFixture
                 .Copy();
 
@@ -246,14 +241,9 @@ public void SharedMultilevelFxLookup_Must_Verify_Folders_in_the_Correct_Order()
         }
 
         [Fact]
+        [PlatformSpecific(TestPlatforms.Windows)] // Multi-level lookup is only supported on Windows.
         public void SharedMultilevelFxLookup_Must_Not_Roll_Forward_If_Framework_Version_Is_Specified_Through_Argument()
         {
-            if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-            {
-                // Multi-level lookup is only supported on Windows.
-                return;
-            }
-
             var fixture = SharedFxLookupPortableAppFixture
                 .Copy();
 

diff --git a/src/installer/tests/HostActivation.Tests/NativeHostApis.cs b/src/installer/tests/HostActivation.Tests/NativeHostApis.cs
@@ -128,14 +128,9 @@ public SdkResolutionFixture(SharedTestState state)
         }
 
         [Fact]
+        [PlatformSpecific(TestPlatforms.Windows)] // Multi-level lookup is only supported on Windows.
         public void Hostfxr_get_available_sdks_with_multilevel_lookup()
         {
-            if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-            {
-                // multilevel lookup is not supported on non-Windows
-                return;
-            }
-
             var f = new SdkResolutionFixture(sharedTestState);
 
             // With multi-level lookup (windows only): get local and global sdks sorted by ascending version,
@@ -322,14 +317,9 @@ public void Hostfxr_get_dotnet_environment_info_dotnet_root_only()
         }
 
         [Fact]
+        [PlatformSpecific(TestPlatforms.Windows)] // Multi-level lookup is only supported on Windows.
         public void Hostfxr_get_dotnet_environment_info_with_multilevel_lookup_with_dotnet_root()
         {
-            if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-            {
-                // Only Windows supports multi-level lookup.
-                return;
-            }
-
             var f = new SdkResolutionFixture(sharedTestState);
             string expectedSdkVersions = string.Join(';', new[]
             {
@@ -406,14 +396,9 @@ public void Hostfxr_get_dotnet_environment_info_with_multilevel_lookup_with_dotn
         }
 
         [Fact]
+        [PlatformSpecific(TestPlatforms.Windows)] // Multi-level lookup is only supported on Windows.
         public void Hostfxr_get_dotnet_environment_info_with_multilevel_lookup_only()
         {
-            if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-            {
-                // Only Windows supports multi-level lookup.
-                return;
-            }
-
             var f = new SdkResolutionFixture(sharedTestState);
             string expectedSdkVersions = string.Join(';', new[]
             {
@@ -558,7 +543,7 @@ public SharedTestState()
                     .EnsureRestored()
                     .PublishProject();
 
-                if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+                if (!OperatingSystem.IsWindows())
                 {
                     BreadcrumbLocation = Path.Combine(
                         PortableAppWithExceptionFixture.TestProject.OutputDirectory,

diff --git a/src/installer/tests/HostActivation.Tests/NativeHosting/ApplicationExecution.cs b/src/installer/tests/HostActivation.Tests/NativeHosting/ApplicationExecution.cs
@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Microsoft.DotNet.Cli.Build.Framework;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -101,7 +102,7 @@ public static FluentAssertions.AndConstraint<CommandResultAssertions> ExecuteApp
         public static FluentAssertions.AndConstraint<CommandResultAssertions> ExecuteApplicationWithException(this CommandResultAssertions assertion, string hostPath, string appPath)
         {
             var constraint = assertion.ExecuteApplication(hostPath, appPath);
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            if (OperatingSystem.IsWindows())
             {
                 return constraint.And.HaveStdOutContaining($"hostfxr_run_app threw exception: 0x{Constants.ErrorCode.COMPlusException.ToString("x")}");
             }

diff --git a/src/installer/tests/HostActivation.Tests/NativeHosting/Comhost.cs b/src/installer/tests/HostActivation.Tests/NativeHosting/Comhost.cs
@@ -1,6 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Reflection.Metadata;
@@ -22,17 +23,12 @@ public Comhost(SharedTestState sharedTestState)
         }
 
         [Theory]
+        [PlatformSpecific(TestPlatforms.Windows)] // COM activation is only supported on Windows
         [InlineData(1, true)]
         [InlineData(10, true)]
         [InlineData(10, false)]
         public void ActivateClass(int count, bool synchronous)
         {
-            if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-            {
-                // COM activation is only supported on Windows
-                return;
-            }
-
             string [] args = {
                 "comhost",
                 synchronous ? "synchronous" : "concurrent",
@@ -53,14 +49,9 @@ public void ActivateClass(int count, bool synchronous)
         }
 
         [Fact]
+        [PlatformSpecific(TestPlatforms.Windows)] // COM activation is only supported on Windows
         public void ActivateClass_IgnoreAppLocalHostFxr()
         {
-            if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-            {
-                // COM activation is only supported on Windows
-                return;
-            }
-
             using (var fixture = sharedState.ComLibraryFixture.Copy())
             {
                 File.WriteAllText(Path.Combine(fixture.TestProject.BuiltApp.Location, "hostfxr.dll"), string.Empty);
@@ -86,14 +77,9 @@ public void ActivateClass_IgnoreAppLocalHostFxr()
         }
 
         [Fact]
+        [PlatformSpecific(TestPlatforms.Windows)] // COM activation is only supported on Windows
         public void ActivateClass_ValidateIErrorInfoResult()
         {
-            if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-            {
-                // COM activation is only supported on Windows
-                return;
-            }
-
             using (var fixture = sharedState.ComLibraryFixture.Copy())
             {
                 string missingRuntimeConfig = Path.Combine(fixture.TestProject.BuiltApp.Location,
@@ -121,14 +107,9 @@ public void ActivateClass_ValidateIErrorInfoResult()
         }
 
         [Fact]
+        [PlatformSpecific(TestPlatforms.Windows)] // COM activation is only supported on Windows
         public void LoadTypeLibraries()
         {
-            if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-            {
-                // COM activation is only supported on Windows
-                return;
-            }
-
             using (var fixture = sharedState.ComLibraryFixture.Copy())
             {
                 var comHost = Path.Combine(
@@ -165,7 +146,7 @@ public class SharedTestState : SharedTestStateBase
 
             public SharedTestState()
             {
-                if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+                if (!OperatingSystem.IsWindows())
                 {
                     // COM activation is only supported on Windows
                     return;