Fix lstat P/Invoke on arm64 (#12437)

* Fix lstat P/Invoke on arm64 * Bump TargetFrameworkVersion for mmp (to match mtouch)
xamarin · Aug 16, 2021 · 454831f · 454831f · vs-mobiletools-engineering-service2 · Aug 16, 2021
1 parent e396948
commit 454831f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/tools/common/PathUtils.cs b/tools/common/PathUtils.cs
@@ -187,8 +187,20 @@ struct stat { /* when _DARWIN_FEATURE_64_BIT_INODE is defined */
 			public ulong st_qspare_2;
 		}
 
-		[DllImport ("/usr/lib/libSystem.dylib", EntryPoint = "lstat$INODE64", SetLastError = true)]
-		static extern int lstat (string path, out stat buf);
+		[DllImport ("/usr/lib/libc.dylib", EntryPoint = "lstat$INODE64", SetLastError = true)]
+		static extern int lstat_x64 (string file_name, out stat buf);
+
+		[DllImport ("/usr/lib/libc.dylib", EntryPoint = "lstat", SetLastError = true)]
+		static extern int lstat_arm64 (string file_name, out stat buf);
+
+		static int lstat (string path, out stat buf)
+		{
+			if (RuntimeInformation.ProcessArchitecture == Architecture.Arm64) {
+				return lstat_arm64 (path, out buf);
+			} else {
+				return lstat_x64 (path, out buf);
+			}
+		}
 
 		public static bool IsSymlink (string file)
 		{

diff --git a/tools/mmp/mmp.csproj b/tools/mmp/mmp.csproj
@@ -7,7 +7,7 @@
     <OutputType>Exe</OutputType>
     <AssemblyName>mmp</AssemblyName>
     <RootNamespace>mmp</RootNamespace>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">