fixes

Author: rolfbjarne

tools/assembly-preparer/Scaffolding/Application.cs

@@ -3,7 +3,7 @@
 namespace Xamarin.Bundler;
 
 public class Application {
-	Application () {}
+	public Application () {}
 	public ApplePlatform Platform { get => throw new NotImplementedException (); }
 	public string ProductName => throw new NotImplementedException ();
 	public void LoadSymbols ()

tools/assembly-preparer/Scaffolding/DerivedLinkContext.cs

@@ -9,7 +9,7 @@ namespace Xamarin.Tuner;
 public class DerivedLinkContext : LinkContext {
 	public RegistrarMode Registrar { get => Configuration.Registrar; }
 
-	public Target Target { get => throw new NotImplementedException (); }
+	public Application App => Configuration.App;
 
 	public DerivedLinkContext (LinkerConfiguration configuration) : base (configuration)
 	{

tools/assembly-preparer/Scaffolding/LinkerConfiguration.cs

@@ -9,6 +9,8 @@
 namespace Xamarin.Bundler;
 
 public class LinkerConfiguration {
+	public Application App { get; private set; } = new Application ();
+
 	List<ProductException> exceptions = new List<ProductException> ();
 	public List<ProductException> Exceptions {
 		get {

tools/assembly-preparer/assembly-preparer.csproj

@@ -3,7 +3,7 @@
 	<PropertyGroup>
 		<AssemblyName>assembly-preparer</AssemblyName>
 		<TargetFrameworks>net$(BundledNETCoreAppTargetFrameworkVersion);netstandard2.0</TargetFrameworks>
-		<DefineConstants>$(DefineConstants);PRETRIM;ASSEMBLY_PREPARER</DefineConstants>
+		<DefineConstants>$(DefineConstants);BUNDLER;ASSEMBLY_PREPARER</DefineConstants>
 		<OutputType>Library</OutputType>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<LangVersion>latest</LangVersion>

tools/common/Application.cs

@@ -26,11 +26,8 @@
 
 #if LEGACY_TOOLS
 using PlatformResolver = MonoTouch.Tuner.MonoTouchResolver;
-#elif NET
-using PlatformResolver = Xamarin.Linker.DotNetResolver;
-#elif PRETRIM
 #else
-#error Invalid defines
+using PlatformResolver = Xamarin.Linker.DotNetResolver;
 #endif
 
 // Disable until we get around to enable + fix any issues.

tools/common/cache.cs

@@ -13,7 +13,7 @@ public class Cache {
 	const string NAME = "mtouch";
 #elif BUNDLER
 	const string NAME = "dotnet-linker";
-#elif PRETRIM
+#elif ASSEMBLY_PREPARER
 	const string NAME = "assembly-preparer";
 #else
 #error Wrong defines

tools/linker/CoreOptimizeGeneratedCode.cs

@@ -949,7 +949,7 @@ int ProcessBlockLiteralConstructor (MethodDefinition caller, Instruction ins)
 					return 0;
 				}
 
-				var userDelegateType = LinkContext.Target.StaticRegistrar.GetUserDelegateType (trampolineMethod);
+				var userDelegateType = LinkContext.App.StaticRegistrar.GetUserDelegateType (trampolineMethod);
 				MethodReference? userMethod = null;
 				var blockSignature = true;
 				if (userDelegateType is not null) {

tools/mtouch/mtouch.cs

@@ -10,12 +10,16 @@
 
 using Mono.Options;
 
+using Xamarin.Utils;
+
 namespace Xamarin.Bundler {
 	public partial class Driver {
 		internal const string NAME = "mtouch";
 
 		static int Main2 (string [] args)
 		{
+			ErrorHelper.Platform = ApplePlatform.iOS;
+
 			var app = new Application ();
 			var os = new OptionSet ();
 			ParseOptions (app, os, args);