(#3526) Minor fixes for mono in the benchmarks and tests

RuntimeInformation is shadowed by Mono which means that build breaks and because all of the namespaces are the same under Mono's version, that name is not usable in our build currently. We can reuse our existing Platform.GetPlatform() helper here instead, rather than trying to disentangle exactly why this build configuration is not particularly functional.
chocolatey · Oct 31, 2024 · b62b5e0 · b62b5e0
1 parent 117cf17
commit b62b5e0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/chocolatey.benchmark/helpers/PinvokeProcessHelper.cs b/src/chocolatey.benchmark/helpers/PinvokeProcessHelper.cs
@@ -8,6 +8,7 @@
 using System.Security.Permissions;
 using System.Security;
 using chocolatey.infrastructure.information;
+using chocolatey.infrastructure.platforms;
 
 namespace chocolatey.benchmark.helpers
 {
@@ -40,7 +41,7 @@ public static ProcessTree GetDocumentedProcessTree(Process process = null)
 
             var tree = new ProcessTree(process.ProcessName);
 
-            if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            if (Platform.GetPlatform() != PlatformType.Windows)
             {
                 return tree;
             }
@@ -65,7 +66,7 @@ public static ProcessTree GetDocumentedProcessTree(Process process = null)
 
         public static string GetDocumentedParent(Process process = null)
         {
-            if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            if (Platform.GetPlatform() != PlatformType.Windows)
             {
                 return null;
             }
@@ -110,7 +111,7 @@ public static string GetDocumentedParent(Process process = null)
 
         public static string GetDocumentedParentFiltered(Process process = null)
         {
-            if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            if (Platform.GetPlatform() != PlatformType.Windows)
             {
                 return null;
             }
@@ -195,7 +196,7 @@ public static ProcessTree GetUndocumentedProcessTree(Process process = null)
 
         public static string GetUndocumentedParent(Process process = null)
         {
-            if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            if (Platform.GetPlatform() != PlatformType.Windows)
             {
                 return null;
             }
@@ -240,7 +241,7 @@ public static string GetUndocumentedParent(Process process = null)
 
         public static string GetUndocumentedParentFiltered(Process process = null)
         {
-            if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            if (Platform.GetPlatform() != PlatformType.Windows)
             {
                 return null;
             }

diff --git a/src/chocolatey.tests/infrastructure.app/nuget/NugetCommonSpecs.cs b/src/chocolatey.tests/infrastructure.app/nuget/NugetCommonSpecs.cs
@@ -184,7 +184,7 @@ public void Should_set_user_agent_string()
                 // Change this when the NuGet version is updated.
                 //var expectedUserAgentRegexString = @"^{0}\/[\d\.]+(-[a-z\d\.-]+)? nunit-agent\/[\d\.]+(-[a-z\d\.-]+)? \([a-z\d\.]+(,[a-z\d\.]+)?\) via NuGet Client\/[\d\.]+".FormatWith(ApplicationParameters.UserAgent);
                 var currentProcess = Process.GetCurrentProcess();
-                var expectedUserAgentRegexString = @"^{0}\/[\d\.]+(-[A-za-z\d\.-]+)? {1}\/[\d\.]+(-[A-Za-z\d\.-]+)? \([A-za-z\d\.-]+(,[A-Za-z\d\.-]+)?\) via NuGet Client\/[\d\.]+".FormatWith(ApplicationParameters.UserAgent, currentProcess.ProcessName);
+                var expectedUserAgentRegexString = @"^{0}\/[\d\.]+(-[A-za-z\d\.-]+)? {1}\/[\d\.]+(-[A-Za-z\d\.-]+)? (\([A-za-z\d\.-]+(,[A-Za-z\d\.-]+)?\) )?via NuGet Client\/[\d\.]+".FormatWith(ApplicationParameters.UserAgent, currentProcess.ProcessName);
                 UserAgent.UserAgentString.Should().MatchRegex(expectedUserAgentRegexString);
             }
         }