[XamlC] Allow overriding the assembly resolver and whether to compile (#1003)

* [XamlC] Allow overriding the assembly resolver and whether to compile by default

* [XamlC] Add ForceCompile to override attributes

1 files changed, 28 insertions, 15 deletions

diff --git a/Xamarin.Forms.Build.Tasks/XamlCTask.cs b/Xamarin.Forms.Build.Tasks/XamlCTask.cs
index 56c12887..4536e7d6 100644
--- a/Xamarin.Forms.Build.Tasks/XamlCTask.cs
+++ b/Xamarin.Forms.Build.Tasks/XamlCTask.cs
@@ -19,6 +19,11 @@ namespace Xamarin.Forms.Build.Tasks
 		[Obsolete("OutputGeneratedILAsCode is obsolete as of version 2.3.4. This option is no longer available.")]
 		public bool OutputGeneratedILAsCode { get; set; }
 
+		public bool CompileByDefault { get; set; }
+		public bool ForceCompile { get; set; }
+
+		public IAssemblyResolver DefaultAssemblyResolver { get; set; }
+
 		internal string Type { get; set; }
 		internal MethodDefinition InitCompForType { get; private set; }
 		internal bool ReadOnly { get; set; }
@@ -35,7 +40,7 @@ namespace Xamarin.Forms.Build.Tasks
 				Logger.LogLine(1, "ReferencePath: \t{0}", ReferencePath.Replace("//", "/"));
 			Logger.LogLine(3, "DebugSymbols:\"{0}\"", DebugSymbols);
 			Logger.LogLine(3, "DebugType:\"{0}\"", DebugType);
-			var skipassembly = true; //change this to false to enable XamlC by default
+			var skipassembly = !CompileByDefault;
 			bool success = true;
 
 			if (!File.Exists(Assembly))
@@ -44,26 +49,34 @@ namespace Xamarin.Forms.Build.Tasks
 				return true;
 			}
 
-			var resolver = new XamlCAssemblyResolver();
-			if (!string.IsNullOrEmpty(DependencyPaths))
+			var resolver = DefaultAssemblyResolver ?? new XamlCAssemblyResolver();
+			var xamlCResolver = resolver as XamlCAssemblyResolver;
+
+			if (xamlCResolver != null)
 			{
-				foreach (var dep in DependencyPaths.Split(';'))
+				if (!string.IsNullOrEmpty(DependencyPaths))
 				{
-					Logger.LogLine(3, "Adding searchpath {0}", dep);
-					resolver.AddSearchDirectory(dep);
+					foreach (var dep in DependencyPaths.Split(';'))
+					{
+						Logger.LogLine(3, "Adding searchpath {0}", dep);
+						xamlCResolver.AddSearchDirectory(dep);
+					}
 				}
-			}
 
-			if (!string.IsNullOrEmpty(ReferencePath))
-			{
-				var paths = ReferencePath.Replace("//", "/").Split(';');
-				foreach (var p in paths)
+				if (!string.IsNullOrEmpty(ReferencePath))
 				{
-					var searchpath = Path.GetDirectoryName(p);
-					Logger.LogLine(3, "Adding searchpath {0}", searchpath);
-					resolver.AddSearchDirectory(searchpath);
+					var paths = ReferencePath.Replace("//", "/").Split(';');
+					foreach (var p in paths)
+					{
+						var searchpath = Path.GetDirectoryName(p);
+						Logger.LogLine(3, "Adding searchpath {0}", searchpath);
+						xamlCResolver.AddSearchDirectory(searchpath);
+					}
 				}
 			}
+			else {
+				Logger.LogLine(3, "Ignoring dependency and reference paths due to an unsupported resolver");
+			}
 
 			var debug = DebugSymbols || (!string.IsNullOrEmpty(DebugType) && DebugType.ToLowerInvariant() != "none");
 
@@ -128,7 +141,7 @@ namespace Xamarin.Forms.Build.Tasks
 						if (Type != null)
 							skiptype = !(Type == classname);
 
-						if (skiptype) {
+						if (skiptype && !ForceCompile) {
 							Logger.LogLine(2, "Has XamlCompilationAttribute set to Skip and not Compile... skipped");
 							continue;
 						}