From 351d4292732d09409169b4acaec9d27dafd06ab7 Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Wed, 11 May 2016 12:03:15 -0400 Subject: [PATCH] [msbuild] Fixed Optimize metadata parsing logic for BundleResources Fixes bug #41019 --- .../Tasks/CollectBundleResourcesTaskBase.cs | 2 +- .../Tasks/CompileAppManifestTaskBase.cs | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/msbuild/Xamarin.MacDev.Tasks.Core/Tasks/CollectBundleResourcesTaskBase.cs b/msbuild/Xamarin.MacDev.Tasks.Core/Tasks/CollectBundleResourcesTaskBase.cs index 0954c3ed01..bce7973976 100644 --- a/msbuild/Xamarin.MacDev.Tasks.Core/Tasks/CollectBundleResourcesTaskBase.cs +++ b/msbuild/Xamarin.MacDev.Tasks.Core/Tasks/CollectBundleResourcesTaskBase.cs @@ -93,7 +93,7 @@ namespace Xamarin.MacDev.Tasks if (string.IsNullOrEmpty (metadata)) metadata = item.GetMetadata ("OptimizeImage"); - if (!string.IsNullOrEmpty (metadata) || !bool.TryParse (metadata, out optimize)) { + if (string.IsNullOrEmpty (metadata) || !bool.TryParse (metadata, out optimize)) { switch (Path.GetExtension (item.ItemSpec).ToLowerInvariant ()) { case ".plist": case ".strings": optimize = OptimizePropertyLists; break; case ".png": optimize = OptimizePNGs; break; diff --git a/msbuild/Xamarin.iOS.Tasks.Core/Tasks/CompileAppManifestTaskBase.cs b/msbuild/Xamarin.iOS.Tasks.Core/Tasks/CompileAppManifestTaskBase.cs index 34ee4d952e..09f125ee94 100644 --- a/msbuild/Xamarin.iOS.Tasks.Core/Tasks/CompileAppManifestTaskBase.cs +++ b/msbuild/Xamarin.iOS.Tasks.Core/Tasks/CompileAppManifestTaskBase.cs @@ -8,9 +8,11 @@ using Microsoft.Build.Utilities; using Xamarin.MacDev.Tasks; using Xamarin.MacDev; +using System.Runtime.InteropServices; namespace Xamarin.iOS.Tasks { + [ClassInterface (ClassInterfaceType.None)] public abstract class CompileAppManifestTaskBase : Xamarin.MacDev.Tasks.CompileAppManifestTaskBase { [Required] @@ -204,6 +206,7 @@ namespace Xamarin.iOS.Tasks void SetDeviceFamily (PDictionary plist) { + Log.LogWarning ("SetDeviceFamily: {0}", Framework); switch (Framework) { case PlatformFramework.iOS: SetIOSDeviceFamily (plist); @@ -219,6 +222,7 @@ namespace Xamarin.iOS.Tasks void SetIOSDeviceFamily (PDictionary plist) { + Log.LogWarning ("SetIOSDeviceFamily: MinimumOSVersion = {0}, supportedDevices = {1}", minimumOSVersion, supportedDevices); if (IsWatchApp) { if (SdkIsSimulator) { plist.SetUIDeviceFamily (IPhoneDeviceType.IPhone | IPhoneDeviceType.Watch);