Static linking and linux-arm improvements

Author: harry-cpp

Resources/Program.txt

@@ -28,7 +28,11 @@ public class {X}
         }
         else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
         {
-            return Path.Combine(baseDir, "linux-x64", commandid);
+            return RuntimeInformation.ProcessArchitecture switch
+            {
+                Architecture.Arm or Architecture.Arm64 => Path.Combine(baseDir, "linux-arm64", commandid),
+                _ => Path.Combine(baseDir, "linux-x64", commandid)
+            };
         }
 
         return commandid;

Tasks/PackageTask.cs

@@ -44,7 +44,11 @@ public override async Task RunAsync(BuildContext context)
             }
             else if (context.IsRunningOnLinux())
             {
-                rid = "linux-x64";
+                rid = RuntimeInformation.ProcessArchitecture switch
+                {
+                    Architecture.Arm or Architecture.Arm64 => "linux-arm64",
+                    _ => "linux-x64"
+                };
             }
             else if (context.IsRunningOnMacOs())
             {

Tasks/TestLinuxTask.cs

@@ -62,8 +62,16 @@ out IEnumerable<string> processOutput
                 }
                 else
                 {
-                    context.Information($"INVALID: {libPath}");
-                    passedTests = false;
+                    var pathToCheck = System.IO.Path.Combine(context.ArtifactsDir, libPath);
+                    if (!libPath.Contains('/') && File.Exists(pathToCheck))
+                    {
+                        context.Information($"VALID linkage: {libPath}");
+                    }
+                    else
+                    {
+                        context.Information($"INVALID linkage: {libPath}");
+                        passedTests = false;
+                    }
                 }
             }
 

Tasks/TestMacOSTask.cs

@@ -45,8 +45,17 @@ out IEnumerable<string> processOutput
                 }
                 else
                 {
-                    context.Information($"INVALID linkage: {libPath}");
-                    passedTests = false;
+                    var libName = libPath.Replace("@rpath/", "");
+                    var pathToCheck = System.IO.Path.Combine(context.ArtifactsDir, libName);
+                    if (!libName.Contains('/') && File.Exists(pathToCheck))
+                    {
+                        context.Information($"VALID linkage: {libPath}");
+                    }
+                    else
+                    {
+                        context.Information($"INVALID linkage: {libPath}");
+                        passedTests = false;
+                    }
                 }
             }