[msbuild] Fixed Optimize metadata parsing logic for BundleResources
Fixes bug #41019
This commit is contained in:
Родитель
fab94ff5c9
Коммит
351d429273
|
@ -93,7 +93,7 @@ namespace Xamarin.MacDev.Tasks
|
||||||
if (string.IsNullOrEmpty (metadata))
|
if (string.IsNullOrEmpty (metadata))
|
||||||
metadata = item.GetMetadata ("OptimizeImage");
|
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 ()) {
|
switch (Path.GetExtension (item.ItemSpec).ToLowerInvariant ()) {
|
||||||
case ".plist": case ".strings": optimize = OptimizePropertyLists; break;
|
case ".plist": case ".strings": optimize = OptimizePropertyLists; break;
|
||||||
case ".png": optimize = OptimizePNGs; break;
|
case ".png": optimize = OptimizePNGs; break;
|
||||||
|
|
|
@ -8,9 +8,11 @@ using Microsoft.Build.Utilities;
|
||||||
|
|
||||||
using Xamarin.MacDev.Tasks;
|
using Xamarin.MacDev.Tasks;
|
||||||
using Xamarin.MacDev;
|
using Xamarin.MacDev;
|
||||||
|
using System.Runtime.InteropServices;
|
||||||
|
|
||||||
namespace Xamarin.iOS.Tasks
|
namespace Xamarin.iOS.Tasks
|
||||||
{
|
{
|
||||||
|
[ClassInterface (ClassInterfaceType.None)]
|
||||||
public abstract class CompileAppManifestTaskBase : Xamarin.MacDev.Tasks.CompileAppManifestTaskBase
|
public abstract class CompileAppManifestTaskBase : Xamarin.MacDev.Tasks.CompileAppManifestTaskBase
|
||||||
{
|
{
|
||||||
[Required]
|
[Required]
|
||||||
|
@ -204,6 +206,7 @@ namespace Xamarin.iOS.Tasks
|
||||||
|
|
||||||
void SetDeviceFamily (PDictionary plist)
|
void SetDeviceFamily (PDictionary plist)
|
||||||
{
|
{
|
||||||
|
Log.LogWarning ("SetDeviceFamily: {0}", Framework);
|
||||||
switch (Framework) {
|
switch (Framework) {
|
||||||
case PlatformFramework.iOS:
|
case PlatformFramework.iOS:
|
||||||
SetIOSDeviceFamily (plist);
|
SetIOSDeviceFamily (plist);
|
||||||
|
@ -219,6 +222,7 @@ namespace Xamarin.iOS.Tasks
|
||||||
|
|
||||||
void SetIOSDeviceFamily (PDictionary plist)
|
void SetIOSDeviceFamily (PDictionary plist)
|
||||||
{
|
{
|
||||||
|
Log.LogWarning ("SetIOSDeviceFamily: MinimumOSVersion = {0}, supportedDevices = {1}", minimumOSVersion, supportedDevices);
|
||||||
if (IsWatchApp) {
|
if (IsWatchApp) {
|
||||||
if (SdkIsSimulator) {
|
if (SdkIsSimulator) {
|
||||||
plist.SetUIDeviceFamily (IPhoneDeviceType.IPhone | IPhoneDeviceType.Watch);
|
plist.SetUIDeviceFamily (IPhoneDeviceType.IPhone | IPhoneDeviceType.Watch);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче