ff

Author: dellis1972

src/Xamarin.Android.Build.Tasks/Tasks/ResolveAssemblies.cs

@@ -102,7 +102,6 @@ bool Execute (DirectoryAssemblyResolver resolver)
 						}
 					}
 					topAssemblyReferences.Add (assemblyDef);
-					Log.LogDebugMessage ($"Attempting to Add {Path.GetFullPath (assemblyDef.MainModule.FullyQualifiedName)}");
 					assemblies.Add (Path.GetFullPath (assemblyDef.MainModule.FullyQualifiedName));
 				}
 			} catch (Exception ex) {
@@ -146,36 +145,31 @@ JToken GetTargetFrameworkMonikerForNuget (JToken targets)
 		{
 			foreach (var targetMoniker in TargetMonikers) {
 				var targetMonikerWithoutRuntimeIdentifier = targetMoniker.ItemSpec;
-				if (targets[targetMonikerWithoutRuntimeIdentifier] != null)
-					return targets[targetMonikerWithoutRuntimeIdentifier];
+				if (targets [targetMonikerWithoutRuntimeIdentifier] != null)
+					return targets [targetMonikerWithoutRuntimeIdentifier];
 			}
-			var enumerableTargets = targets.Cast<KeyValuePair<string, JToken>>();
-			return enumerableTargets.FirstOrDefault().Value ?? null;
+			var enumerableTargets = targets.Cast<KeyValuePair<string, JToken>> ();
+			return enumerableTargets.FirstOrDefault ().Value ?? null;
 		}
 
 		AssemblyDefinition ResolveRuntimeAssemblyForReferenceAssembly (JToken targets, DirectoryAssemblyResolver resolver, AssemblyNameDefinition assemblyNameDefinition)
 		{
 			var targetFramework = GetTargetFrameworkMonikerForNuget (targets);
 			if (targetFramework == null)
 				return null;
-			Log.LogDebugMessage ($"Got targetFramework");
 			var packageRoot = targetFramework.Cast<JProperty>().FirstOrDefault (x => x.Name.StartsWith (assemblyNameDefinition.Name));
 			if (packageRoot == null)
 				return null;
 			var packageName = packageRoot.Name;
-			Log.LogDebugMessage ($"Got packageRoot {packageName}");
-			var package = packageRoot.FirstOrDefault();
+			var package = packageRoot.FirstOrDefault ();
 			if (package == null)
 				return null;
-			Log.LogDebugMessage ($"Got package");
-			var runtime = package["runtime"];
+			var runtime = package ["runtime"];
 			if (runtime == null)
 				return null;
-			Log.LogDebugMessage ($"Got runtime");
 			var property = runtime.FirstOrDefault () as JProperty;
 			if (property == null)
 				return null;
-			Log.LogDebugMessage ($"Got property");
 			var path = Path.Combine (NuGetPackageRoot, packageName, property.Name);
 			Log.LogDebugMessage ($"Attempting to load {path}");
 			return resolver.Load (path, forceLoad: true);

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/PackagingTest.cs

@@ -346,6 +346,7 @@ protected override void OnResume()
 				"System.dll",
 				"System.Runtime.Serialization.dll",
 				"System.IO.Packaging.dll",
+				"System.IO.Compression.dll",
 				"Mono.Android.Export.dll",
 				"App1.dll",
 				"FormsViewGroup.dll",