[dotnet] Add support for universal apps.

dotnet/targets/Xamarin.Shared.Sdk.targets

@@ -209,7 +209,7 @@
 	<!-- PublishTrimmed must be calculated as part of a target because IsMacEnabled on Windows will be set after connecting to the Mac -->
 	<Target Name="_ComputePublishTrimmed">
 		<PropertyGroup>
-			<PublishTrimmed Condition="'$(PublishTrimmed)' == '' And ($(_ProjectType.EndsWith('ExecutableProject')) Or $(_ProjectType.EndsWith('AppExtensionProject'))) And '$(IsMacEnabled)' == 'true'">true</PublishTrimmed>
+			<PublishTrimmed Condition="'$(PublishTrimmed)' == '' And '$(RuntimeIdentifier)' != '' And ($(_ProjectType.EndsWith('ExecutableProject')) Or $(_ProjectType.EndsWith('AppExtensionProject'))) And '$(IsMacEnabled)' == 'true'">true</PublishTrimmed>
 		</PropertyGroup>
 	</Target>
 

runtime/product.h

@@ -6,6 +6,8 @@
 *
 */
 
+#include <TargetConditionals.h>
+
 #ifdef MONOTOUCH
   #if TARGET_OS_WATCH
 	#define PRODUCT                  "Xamarin.WatchOS"
@@ -43,4 +45,45 @@
 	#define ARCH_SUBDIR				
 #else
     #error Either MONOTOUCH or MONOMAC must be defined.
-#endif
+#endif
+
+// Set RuntimeIdentifier defines
+#if TARGET_OS_MACCATALYST
+  #define RUNTIMEIDENTIFIER_PLATFORM    "maccatalyst"
+#elif TARGET_OS_IOS
+  #if TARGET_OS_SIMULATOR
+    #define RUNTIMEIDENTIFIER_PLATFORM  "iossimulator"
+  #else
+    #define RUNTIMEIDENTIFIER_PLATFORM  "ios"
+  #endif
+#elif TARGET_OS_TV
+  #if TARGET_OS_SIMULATOR
+    #define RUNTIMEIDENTIFIER_PLATFORM  "tvossimulator"
+  #else
+    #define RUNTIMEIDENTIFIER_PLATFORM  "tvos"
+  #endif
+#elif TARGET_OS_WATCH
+  #if TARGET_OS_SIMULATOR
+    #define RUNTIMEIDENTIFIER_PLATFORM  "watchossimulator"
+  #else
+    #define RUNTIMEIDENTIFIER_PLATFORM  "watchos"
+  #endif
+#elif TARGET_OS_OSX
+  #define RUNTIMEIDENTIFIER_PLATFORM    "osx"
+#else
+  #error Unknown platform
+#endif
+
+#if defined (__aarch64__)
+  #define RUNTIMEIDENTIFIER_ARCHITECTURE "arm64"
+#elif defined (__x86_64__)
+  #define RUNTIMEIDENTIFIER_ARCHITECTURE "x64"
+#elif defined (__i386__)
+  #define RUNTIMEIDENTIFIER_ARCHITECTURE "x86"
+#elif defined (__arm__)
+  #define RUNTIMEIDENTIFIER_ARCHITECTURE "arm"
+#else
+    #error Unknown architecture
+#endif
+
+#define RUNTIMEIDENTIFIER RUNTIMEIDENTIFIER_PLATFORM "-" RUNTIMEIDENTIFIER_ARCHITECTURE

runtime/runtime.m

@@ -2478,7 +2478,7 @@ -(void) xamarinSetFlags: (enum XamarinGCHandleFlags) flags;
  *
  * The platform assembly (Xamarin.[iOS|TVOS|WatchOS].dll) and any assemblies
  * the platform assembly references (mscorlib.dll, System.dll) may be in a
- * pointer-size subdirectory (ARCH_SUBDIR).
+ * pointer-size subdirectory (ARCH_SUBDIR), or an RID-specific subdirectory.
  * 
  * AOT data files will have an arch-specific infix.
  */
@@ -2536,6 +2536,16 @@ -(void) xamarinSetFlags: (enum XamarinGCHandleFlags) flags;
 	}
 #endif // !MONOMAC
 
+#if DOTNET
+	// RID-specific subdirectory
+	if (snprintf (path, pathlen, "%s/.xamarin/%s/%s", root, RUNTIMEIDENTIFIER, resource) < 0) {
+		LOG (PRODUCT ": Failed to construct path for resource: %s (5): %s", resource, strerror (errno));
+		return false;
+	} else if (xamarin_file_exists (path)) {
+		return true;
+	}
+#endif
+
 	// just the file, no extensions, etc.
 	if (snprintf (path, pathlen, "%s/%s", root, resource) < 0) {
 		LOG (PRODUCT ": Failed to construct path for resource: %s (6): %s", resource, strerror (errno));

tests/dotnet/MySimpleApp/AppDelegate.cs

@@ -0,0 +1,19 @@
+using System;
+using System.Runtime.InteropServices;
+
+using Foundation;
+
+namespace MySimpleApp
+{
+	public class Program
+	{
+		static int Main (string[] args)
+		{
+			GC.KeepAlive (typeof (NSObject)); // prevent linking away the platform assembly
+
+			Console.WriteLine (Environment.GetEnvironmentVariable ("MAGIC_WORD"));
+
+			return 0;
+		}
+	}
+}

tests/dotnet/MySimpleApp/MacCatalyst/Info.plist

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+</dict>
+</plist>

tests/dotnet/MySimpleApp/MacCatalyst/Makefile

@@ -0,0 +1,9 @@
+TOP=../../../..
+
+include $(TOP)/Make.config
+
+build:
+	$(DOTNET6) build /bl *.csproj $(MSBUILD_VERBOSITY)
+
+run:
+	$(DOTNET6) build /bl *.csproj $(MSBUILD_VERBOSITY) -t:Run

tests/dotnet/MySimpleApp/MacCatalyst/MySimpleApp.csproj

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<TargetFramework>net6.0-maccatalyst</TargetFramework>
+	</PropertyGroup>
+	<Import Project="..\shared.csproj" />
+</Project>

tests/dotnet/MySimpleApp/Makefile

@@ -0,0 +1,20 @@
+TOP=../../..
+
+include $(TOP)/Make.config
+
+prepare:
+	cd .. && $(MAKE) global.json NuGet.config
+	rm -Rf */bin */obj
+
+all-ios: prepare
+	$(DOTNET6) build iOS/*.csproj /bl
+
+all-mac: prepare
+	$(DOTNET6) build macOS/*.csproj /bl
+
+run-mac:
+	./macOS/bin/Debug/net6.0-macos/osx-x64/$(notdir $(CURDIR)).app/Contents/MacOS/$(notdir $(CURDIR))
+
+diag:
+	cd .. && $(MAKE) global.json NuGet.config
+	$(DOTNET6) build /v:diag *binlog

tests/dotnet/MySimpleApp/iOS/Info.plist

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<!-- We need this because some tests will build this project for 32-bit targets -->
+	<key>MinimumOSVersion</key>
+	<string>10.0</string></dict>
+</plist>

tests/dotnet/MySimpleApp/iOS/Makefile

@@ -0,0 +1,9 @@
+TOP=../../../..
+
+include $(TOP)/Make.config
+
+build:
+	$(DOTNET6) build /bl *.csproj $(MSBUILD_VERBOSITY)
+
+run:
+	$(DOTNET6) build /bl *.csproj $(MSBUILD_VERBOSITY) -t:Run

tests/dotnet/MySimpleApp/iOS/MySimpleApp.csproj

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<TargetFramework>net6.0-ios</TargetFramework>
+	</PropertyGroup>
+	<Import Project="..\shared.csproj" />
+</Project>

tests/dotnet/MySimpleApp/macOS/Info.plist

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+</dict>
+</plist>

tests/dotnet/MySimpleApp/macOS/Makefile

@@ -0,0 +1,9 @@
+TOP=../../../..
+
+include $(TOP)/Make.config
+
+build:
+	$(DOTNET6) build /bl *.csproj $(MSBUILD_VERBOSITY)
+
+run:
+	$(DOTNET6) build /bl *.csproj $(MSBUILD_VERBOSITY) -t:Run

tests/dotnet/MySimpleApp/macOS/MySimpleApp.csproj

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<TargetFramework>net6.0-macos</TargetFramework>
+	</PropertyGroup>
+	<Import Project="..\shared.csproj" />
+</Project>

tests/dotnet/MySimpleApp/shared.csproj

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+	<PropertyGroup>
+		<OutputType>Exe</OutputType>
+
+		<ApplicationTitle>MySimpleApp</ApplicationTitle>
+		<ApplicationId>com.xamarin.mysimpleapp</ApplicationId>
+		<ApplicationVersion>3.14</ApplicationVersion>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<Compile Include="../*.cs" />
+		<None Include="Info.plist" />
+	</ItemGroup>
+</Project>

tests/dotnet/MySimpleApp/tvOS/Info.plist

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+</dict>
+</plist>

tests/dotnet/MySimpleApp/tvOS/Makefile

@@ -0,0 +1,9 @@
+TOP=../../../..
+
+include $(TOP)/Make.config
+
+build:
+	$(DOTNET6) build /bl *.csproj $(MSBUILD_VERBOSITY)
+
+run:
+	$(DOTNET6) build /bl *.csproj $(MSBUILD_VERBOSITY) -t:Run

tests/dotnet/MySimpleApp/tvOS/MySimpleApp.csproj

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net6.0-tvos</TargetFramework>
+  </PropertyGroup>
+  <Import Project="..\shared.csproj" />
+</Project>

tools/common/Assembly.cs

@@ -717,7 +717,7 @@ public bool CopyAssembly (string source, string target, bool copy_debug_symbols
 				if (!Application.IsUptodate (source, target) && (strip_assembly || !Cache.CompareAssemblies (source, target))) {
 					copied = true;
 					if (strip_assembly) {
-						Driver.FileDelete (target);
+						PathUtils.FileDelete (target);
 						Directory.CreateDirectory (Path.GetDirectoryName (target));
 						MonoTouch.Tuner.Stripper.Process (source, target);
 					} else {

tools/common/Driver.cs

@@ -1246,63 +1246,5 @@ public static Frameworks GetFrameworks (Application app)
 				throw ErrorHelper.CreateError (71, Errors.MX0071, app.Platform, app.ProductName);
 			return rv;
 		}
-
-		[DllImport (Constants.libSystemLibrary)]
-		static extern int symlink (string path1, string path2);
-
-		public static bool Symlink (string path1, string path2)
-		{
-			return symlink (path1, path2) == 0;
-		}
-
-		[DllImport (Constants.libSystemLibrary)]
-		static extern int unlink (string pathname);
-
-		public static void FileDelete (string file)
-		{
-			// File.Delete can't always delete symlinks (in particular if the symlink points to a file that doesn't exist).
-			unlink (file);
-			// ignore any errors.
-		}
-
-		struct timespec {
-			public IntPtr tv_sec;
-			public IntPtr tv_nsec;
-		}
-
-		struct stat { /* when _DARWIN_FEATURE_64_BIT_INODE is defined */
-			public uint st_dev;
-			public ushort st_mode;
-			public ushort st_nlink;
-			public ulong st_ino;
-			public uint st_uid;
-			public uint st_gid;
-			public uint st_rdev;
-			public timespec st_atimespec;
-			public timespec st_mtimespec;
-			public timespec st_ctimespec;
-			public timespec st_birthtimespec;
-			public ulong st_size;
-			public ulong st_blocks;
-			public uint st_blksize;
-			public uint st_flags;
-			public uint st_gen;
-			public uint st_lspare;
-			public ulong st_qspare_1;
-			public ulong st_qspare_2;
-		}
-
-		[DllImport (Constants.libSystemLibrary, EntryPoint = "lstat$INODE64", SetLastError = true)]
-		static extern int lstat (string path, out stat buf);
-
-		public static bool IsSymlink (string file)
-		{
-			stat buf;
-			var rv = lstat (file, out buf);
-			if (rv != 0)
-				throw new Exception (string.Format ("Could not lstat '{0}': {1}", file, Marshal.GetLastWin32Error ()));
-			const int S_IFLNK = 40960;
-			return (buf.st_mode & S_IFLNK) == S_IFLNK;
-		}
 	}
 }

tools/common/MachO.cs

@@ -495,6 +495,27 @@ public static bool IsDynamicFramework (string filename)
 
 			return true;
 		}
+
+		public static bool IsMachOFile (string filename)
+		{
+			using (var fs = new FileStream (filename, FileMode.Open, FileAccess.Read, FileShare.Read)) {
+				if (fs.Length < 4)
+					return false;
+				using (var reader = new BinaryReader (fs)) {
+					var magic = reader.ReadUInt32 ();
+					reader.BaseStream.Position = 0;
+					switch (magic) {
+					case MH_MAGIC:
+					case MH_MAGIC_64:
+					case FAT_MAGIC: // little-endian fat binary
+					case FAT_CIGAM: // big-endian fat binary
+						return true;
+					default:
+						return false;
+					}
+				}
+			}
+		}
 	}
 
 	public class StaticLibrary
@@ -573,7 +594,12 @@ public static bool IsStaticLibrary (BinaryReader reader, bool throw_if_error = f
 			var pos = reader.BaseStream.Position;
 
 			var bytes = reader.ReadBytes (8);
-			var rv = bytes [0] == '!' && bytes [1] == '<' && bytes [2] == 'a' && bytes [3] == 'r' && bytes [4] == 'c' && bytes [5] == 'h' && bytes [6] == '>' && bytes [7] == 0xa;
+			bool rv;
+			if (bytes.Length < 8) {
+				rv = false;
+			} else {
+				rv = bytes [0] == '!' && bytes [1] == '<' && bytes [2] == 'a' && bytes [3] == 'r' && bytes [4] == 'c' && bytes [5] == 'h' && bytes [6] == '>' && bytes [7] == 0xa;
+			}
 			reader.BaseStream.Position = pos;
 
 			if (throw_if_error && !rv)