From f0b992c3c1faf3e0723e9d412b2d41518b56570c Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Mon, 23 Aug 2021 17:40:55 +0200
Subject: [PATCH] [msbuild] Only validate the Info.plist values if we're
 actually creating an app manifest.

---
 .../Tasks/CompileAppManifestTaskBase.cs                        | 2 ++
 msbuild/Xamarin.Shared/Xamarin.Shared.targets                  | 1 +
 .../Xamarin.iOS.Tasks.Core/Tasks/CompileAppManifestTaskCore.cs | 3 +++
 3 files changed, 6 insertions(+)

diff --git a/msbuild/Xamarin.MacDev.Tasks.Core/Tasks/CompileAppManifestTaskBase.cs b/msbuild/Xamarin.MacDev.Tasks.Core/Tasks/CompileAppManifestTaskBase.cs
index 6d04c02440..984f181878 100644
--- a/msbuild/Xamarin.MacDev.Tasks.Core/Tasks/CompileAppManifestTaskBase.cs
+++ b/msbuild/Xamarin.MacDev.Tasks.Core/Tasks/CompileAppManifestTaskBase.cs
@@ -72,6 +72,8 @@ namespace Xamarin.MacDev.Tasks
 		public string SdkVersion { get; set; }
 
 		public string TargetArchitectures { get; set; }
+
+		public bool Validate { get; set; }
 		#endregion
 
 		protected TargetArchitecture architectures;
diff --git a/msbuild/Xamarin.Shared/Xamarin.Shared.targets b/msbuild/Xamarin.Shared/Xamarin.Shared.targets
index 20dc9350cf..4b85fdd94a 100644
--- a/msbuild/Xamarin.Shared/Xamarin.Shared.targets
+++ b/msbuild/Xamarin.Shared/Xamarin.Shared.targets
@@ -337,6 +337,7 @@ Copyright (C) 2018 Microsoft. All rights reserved.
 			SdkIsSimulator="$(_SdkIsSimulator)"
 			SdkVersion="$(_SdkVersion)"
 			DebugIPAddresses="$(_DebugIPAddresses)"
+			Validate="$(_CreateAppManifest)"
 			>
 		</CompileAppManifest>
 	</Target>
diff --git a/msbuild/Xamarin.iOS.Tasks.Core/Tasks/CompileAppManifestTaskCore.cs b/msbuild/Xamarin.iOS.Tasks.Core/Tasks/CompileAppManifestTaskCore.cs
index 5e5a1fdd5d..b931c0b05f 100644
--- a/msbuild/Xamarin.iOS.Tasks.Core/Tasks/CompileAppManifestTaskCore.cs
+++ b/msbuild/Xamarin.iOS.Tasks.Core/Tasks/CompileAppManifestTaskCore.cs
@@ -286,6 +286,9 @@ namespace Xamarin.iOS.Tasks
 
 		void Validation (PDictionary plist)
 		{
+			if (!Validate)
+				return;
+
 			var supportsIPhone = (supportedDevices & IPhoneDeviceType.IPhone) != 0
 			                     || supportedDevices == IPhoneDeviceType.NotSet;
 			var supportsIPad = (supportedDevices & IPhoneDeviceType.IPad) != 0;