Merge pull request #14760 from tamasvajk/apple-silicon-check

tamasvajk · web-flow · commit 28a5a1d507dc · 2023-11-14T10:27:42.000+01:00
C#: Change IsARM to Apple silicon check
diff --git a/cpp/autobuilder/Semmle.Autobuild.Cpp.Tests/BuildScripts.cs b/cpp/autobuilder/Semmle.Autobuild.Cpp.Tests/BuildScripts.cs
@@ -145,9 +145,9 @@ IEnumerable<string> IBuildActions.EnumerateDirectories(string dir)
 
         bool IBuildActions.IsMacOs() => IsMacOs;
 
-        public bool IsArm { get; set; }
+        public bool IsRunningOnAppleSilicon { get; set; }
 
-        bool IBuildActions.IsArm() => IsArm;
+        bool IBuildActions.IsRunningOnAppleSilicon() => IsRunningOnAppleSilicon;
 
         string IBuildActions.PathCombine(params string[] parts)
         {
diff --git a/csharp/autobuilder/Semmle.Autobuild.CSharp.Tests/BuildScripts.cs b/csharp/autobuilder/Semmle.Autobuild.CSharp.Tests/BuildScripts.cs
@@ -159,9 +159,9 @@ IEnumerable<string> IBuildActions.EnumerateDirectories(string dir)
 
         bool IBuildActions.IsMacOs() => IsMacOs;
 
-        public bool IsArm { get; set; }
+        public bool IsRunningOnAppleSilicon { get; set; }
 
-        bool IBuildActions.IsArm() => IsArm;
+        bool IBuildActions.IsRunningOnAppleSilicon() => IsRunningOnAppleSilicon;
 
         public string PathCombine(params string[] parts)
         {
diff --git a/csharp/autobuilder/Semmle.Autobuild.Shared/BuildActions.cs b/csharp/autobuilder/Semmle.Autobuild.Shared/BuildActions.cs
@@ -3,6 +3,7 @@
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
+using System.Linq;
 using System.Runtime.InteropServices;
 using System.Xml;
 using Semmle.Util;
@@ -119,10 +120,10 @@ public interface IBuildActions
         bool IsMacOs();
 
         /// <summary>
-        /// Gets a value indicating whether we are running on arm.
+        /// Gets a value indicating whether we are running on Apple Silicon.
         /// </summary>
-        /// <returns>True if we are running on arm.</returns>
-        bool IsArm();
+        /// <returns>True if we are running on Apple Silicon.</returns>
+        bool IsRunningOnAppleSilicon();
 
         /// <summary>
         /// Combine path segments, Path.Combine().
@@ -240,9 +241,25 @@ int IBuildActions.RunProcess(string cmd, string args, string? workingDirectory,
 
         bool IBuildActions.IsMacOs() => RuntimeInformation.IsOSPlatform(OSPlatform.OSX);
 
-        bool IBuildActions.IsArm() =>
-            RuntimeInformation.ProcessArchitecture == Architecture.Arm64 ||
-            RuntimeInformation.ProcessArchitecture == Architecture.Arm;
+        bool IBuildActions.IsRunningOnAppleSilicon()
+        {
+            var thisBuildActions = (IBuildActions)this;
+
+            if (!thisBuildActions.IsMacOs())
+            {
+                return false;
+            }
+
+            try
+            {
+                thisBuildActions.RunProcess("sysctl", "machdep.cpu.brand_string", workingDirectory: null, env: null, out var stdOut);
+                return stdOut?.Any(s => s?.ToLowerInvariant().Contains("apple") == true) ?? false;
+            }
+            catch (Exception)
+            {
+                return false;
+            }
+        }
 
         string IBuildActions.PathCombine(params string[] parts) => Path.Combine(parts);
 
diff --git a/csharp/autobuilder/Semmle.Autobuild.Shared/MsBuildRule.cs b/csharp/autobuilder/Semmle.Autobuild.Shared/MsBuildRule.cs
@@ -15,14 +15,12 @@ internal static class MsBuildCommandExtensions
         /// <returns></returns>
         public static CommandBuilder MsBuildCommand(this CommandBuilder cmdBuilder, IAutobuilder<AutobuildOptionsShared> builder)
         {
-            var isArmMac = builder.Actions.IsMacOs() && builder.Actions.IsArm();
-
             // mono doesn't ship with `msbuild` on Arm-based Macs, but we can fall back to
             // msbuild that ships with `dotnet` which can be invoked with `dotnet msbuild`
             // perhaps we should do this on all platforms?
-            return isArmMac ?
-                cmdBuilder.RunCommand("dotnet").Argument("msbuild") :
-                cmdBuilder.RunCommand("msbuild");
+            return builder.Actions.IsRunningOnAppleSilicon()
+                ? cmdBuilder.RunCommand("dotnet").Argument("msbuild")
+                : cmdBuilder.RunCommand("msbuild");
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -145,9 +145,9 @@ IEnumerable<string> IBuildActions.EnumerateDirectories(string dir)`
`145`	`145`
`146`	`146`	`bool IBuildActions.IsMacOs() => IsMacOs;`
`147`	`147`
`148`		`- public bool IsArm { get; set; }`
	`148`	`+ public bool IsRunningOnAppleSilicon { get; set; }`
`149`	`149`
`150`		`- bool IBuildActions.IsArm() => IsArm;`
	`150`	`+ bool IBuildActions.IsRunningOnAppleSilicon() => IsRunningOnAppleSilicon;`
`151`	`151`
`152`	`152`	`string IBuildActions.PathCombine(params string[] parts)`
`153`	`153`	`{`
Original file line number	Diff line number	Diff line change
`@@ -159,9 +159,9 @@ IEnumerable<string> IBuildActions.EnumerateDirectories(string dir)`
`159`	`159`
`160`	`160`	`bool IBuildActions.IsMacOs() => IsMacOs;`
`161`	`161`
`162`		`- public bool IsArm { get; set; }`
	`162`	`+ public bool IsRunningOnAppleSilicon { get; set; }`
`163`	`163`
`164`		`- bool IBuildActions.IsArm() => IsArm;`
	`164`	`+ bool IBuildActions.IsRunningOnAppleSilicon() => IsRunningOnAppleSilicon;`
`165`	`165`
`166`	`166`	`public string PathCombine(params string[] parts)`
`167`	`167`	`{`
Original file line number	Diff line number	Diff line change
`@@ -15,14 +15,12 @@ internal static class MsBuildCommandExtensions`
`15`	`15`	`/// <returns></returns>`
`16`	`16`	`public static CommandBuilder MsBuildCommand(this CommandBuilder cmdBuilder, IAutobuilder<AutobuildOptionsShared> builder)`
`17`	`17`	`{`
`18`		`- var isArmMac = builder.Actions.IsMacOs() && builder.Actions.IsArm();`
`19`		`-`
`20`	`18`	// mono doesn't ship with `msbuild` on Arm-based Macs, but we can fall back to
`21`	`19`	// msbuild that ships with `dotnet` which can be invoked with `dotnet msbuild`
`22`	`20`	`// perhaps we should do this on all platforms?`
`23`		`- return isArmMac ?`
`24`		`- cmdBuilder.RunCommand("dotnet").Argument("msbuild") :`
`25`		`- cmdBuilder.RunCommand("msbuild");`
	`21`	`+ return builder.Actions.IsRunningOnAppleSilicon()`
	`22`	`+ ? cmdBuilder.RunCommand("dotnet").Argument("msbuild")`
	`23`	`+ : cmdBuilder.RunCommand("msbuild");`
`26`	`24`	`}`
`27`	`25`	`}`
`28`	`26`