[runtime/msbuild] Clean up some unused code. (#24409)

Author: rolfbjarne

msbuild/Xamarin.MacDev.Tasks/Tasks/CompileAppManifest.cs

@@ -34,21 +34,13 @@ public class CompileAppManifest : XamarinTask, IHasProjectDir, IHasResourcePrefi
 		// This must be an ITaskItem to copy the file to Windows for remote builds.
 		public ITaskItem? AppManifest { get; set; }
 
-		[Required]
-		public string AssemblyName { get; set; } = String.Empty;
-
 		[Required]
 		public string BundleExecutable { get; set; } = "";
 
 		[Required]
 		[Output] // This is required to create an empty file on Windows for the Input/Outputs check.
 		public ITaskItem? CompiledAppManifest { get; set; }
 
-		[Required]
-		public bool Debug { get; set; }
-
-		public string DebugIPAddresses { get; set; } = String.Empty;
-
 		public string DefaultSdkVersion { get; set; } = String.Empty;
 
 		public ITaskItem [] FontFilesToRegister { get; set; } = Array.Empty<ITaskItem> ();
@@ -59,12 +51,6 @@ public class CompileAppManifest : XamarinTask, IHasProjectDir, IHasResourcePrefi
 		[Required]
 		public bool IsAppExtension { get; set; }
 
-		public bool IsXPCService { get; set; }
-
-		public bool IsWatchApp { get; set; }
-
-		public bool IsWatchExtension { get; set; }
-
 		[Required]
 		public string MinSupportedOSPlatformVersion { get; set; } = string.Empty;
 
@@ -183,8 +169,6 @@ public override bool Execute ()
 		void AddXamarinVersionNumber (PDictionary plist)
 		{
 			// Add our own version number
-			if (IsWatchApp)
-				return;
 
 			// This key is our supported way of determining if an app
 			// was built with Xamarin, so it needs to be present in all apps.
@@ -479,9 +463,6 @@ void Validation (PDictionary plist)
 
 		bool CompileMac (PDictionary plist)
 		{
-			if (!IsAppExtension || (IsAppExtension && IsXPCService))
-				plist.SetIfNotPresent ("MonoBundleExecutable", AssemblyName + ".exe");
-
 			return !Log.HasLoggedErrors;
 		}
 
@@ -512,11 +493,6 @@ bool CompileMobile (PDictionary plist)
 
 			SetDeviceFamily (plist);
 
-			if (IsWatchExtension) {
-				if (Debug)
-					SetAppTransportSecurity (plist);
-			}
-
 			SetRequiredArchitectures (plist);
 
 			return !Log.HasLoggedErrors;
@@ -531,7 +507,7 @@ void SetXcodeValues (PDictionary plist, IAppleSdk currentSDK)
 			SetValueIfNotNull (plist, "DTCompiler", sdkSettings.DTCompiler);
 			SetValueIfNotNull (plist, "DTPlatformBuild", dtSettings.DTPlatformBuild);
 			SetValueIfNotNull (plist, "DTSDKBuild", sdkSettings.DTSDKBuild);
-			SetValueIfNotNull (plist, "DTPlatformName", PlatformUtils.GetTargetPlatform (SdkPlatform, IsWatchApp));
+			SetValueIfNotNull (plist, "DTPlatformName", PlatformUtils.GetTargetPlatform (SdkPlatform, false));
 			SetValueIfNotNull (plist, "DTPlatformVersion", dtSettings.DTPlatformVersion);
 			SetValueIfNotNull (plist, "DTSDKName", sdkSettings.CanonicalName);
 			SetValueIfNotNull (plist, "DTXcode", AppleSdkSettings.DTXcode);
@@ -632,31 +608,6 @@ void SetDeviceFamily (PDictionary plist)
 				plist.SetUIDeviceFamily (uiDeviceFamily);
 		}
 
-		void SetAppTransportSecurity (PDictionary plist)
-		{
-			// Debugging over http has a couple of gotchas:
-			// * We can't use https, because that requires a valid server certificate,
-			//   which we can't ensure.
-			//   It would also require a hostname for the mac, which it might not have either.
-			// * NSAppTransportSecurity/NSExceptionDomains does not allow exceptions based
-			//   on IP address (only hostname).
-			// Good news: watchOS 3 will apparently not apply ATS when connecting
-			// directly to IP addresses, which means we won't have to do this at all
-			// (sometime in the future).
-
-			PDictionary? ats;
-
-			if (!plist.TryGetValue (ManifestKeys.NSAppTransportSecurity, out ats))
-				plist.Add (ManifestKeys.NSAppTransportSecurity, ats = new PDictionary ());
-
-			if (ats.GetBoolean (ManifestKeys.NSAllowsArbitraryLoads)) {
-				Log.LogMessage (MessageImportance.Low, MSBStrings.M0017);
-			} else {
-				Log.LogMessage (MessageImportance.Low, MSBStrings.M0018);
-				ats.SetBooleanOrRemove (ManifestKeys.NSAllowsArbitraryLoads, true);
-			}
-		}
-
 		public bool ShouldCopyToBuildServer (ITaskItem item)
 		{
 			// We don't want to copy partial generated manifest files unless they exist and have a non-zero length

msbuild/Xamarin.Shared/Xamarin.Shared.targets

@@ -621,17 +621,11 @@ Copyright (C) 2018 Microsoft. All rights reserved.
 			<_CompileAppManifestInputLine Include="ApplicationTitle=$(ApplicationTitle)" />
 			<_CompileAppManifestInputLine Include="ApplicationVersion=$(ApplicationVersion)" />
 			<_CompileAppManifestInputLine Include="AppManifest=$(AppBundleManifest)" />
-			<_CompileAppManifestInputLine Include="AssemblyName=$(AssemblyName)" />
 			<_CompileAppManifestInputLine Include="CompiledAppManifest=$(_TemporaryAppManifest)" />
-			<_CompileAppManifestInputLine Include="Debug=$(_BundlerDebug)" />
-			<_CompileAppManifestInputLine Include="DebugIPAddresses=$(_DebugIPAddresses)" />
 			<_CompileAppManifestInputLine Include="DefaultSdkVersion=$(_SdkVersion)" />
 			<_CompileAppManifestInputLine Include="FontFilesToRegister=$(_CompileAppManifestFontFilesToRegister)" />
 			<_CompileAppManifestInputLine Include="GenerateApplicationManifest=$(GenerateApplicationManifest)" />
 			<_CompileAppManifestInputLine Include="IsAppExtension=$(IsAppExtension)" />
-			<_CompileAppManifestInputLine Include="IsWatchApp=$(IsWatchApp)" />
-			<_CompileAppManifestInputLine Include="IsWatchExtension=$(IsWatchExtension)" />
-			<_CompileAppManifestInputLine Include="IsXPCService=$(IsXPCService)" />
 			<_CompileAppManifestInputLine Include="MinSupportedOSPlatformVersion=$(MinSupportedOSPlatformVersion)" />
 			<_CompileAppManifestInputLine Include="PartialAppManifests=$(_CompileAppManifestPartialAppManifest)" />
 			<_CompileAppManifestInputLine Include="ProjectDir=$(MSBuildProjectDirectory)" />
@@ -677,18 +671,12 @@ Copyright (C) 2018 Microsoft. All rights reserved.
 			ApplicationTitle="$(ApplicationTitle)"
 			ApplicationVersion="$(ApplicationVersion)"
 			AppManifest="$(AppBundleManifest)"
-			AssemblyName="$(AssemblyName)"
 			BundleExecutable="$(_NativeExecutableName)"
 			CompiledAppManifest="$(_TemporaryAppManifest)"
-			Debug="$(_BundlerDebug)"
-			DebugIPAddresses="$(_DebugIPAddresses)"
 			DefaultSdkVersion="$(_SdkVersion)"
 			FontFilesToRegister="@(_FontFilesToRegister)"
 			GenerateApplicationManifest="$(GenerateApplicationManifest)"
 			IsAppExtension="$(IsAppExtension)"
-			IsWatchApp="$(IsWatchApp)"
-			IsWatchExtension="$(IsWatchExtension)"
-			IsXPCService="$(IsXPCService)"
 			MinSupportedOSPlatformVersion="$(MinSupportedOSPlatformVersion)"
 			PartialAppManifests="@(PartialAppManifest)"
 			ProjectDir="$(MSBuildProjectDirectory)"

runtime/xamarin/launch.h

@@ -18,7 +18,6 @@ CompileAppManifest CreateTask (string? tmpdir = null, ApplePlatform platform = A
 				tmpdir = Cache.CreateTemporaryDirectory ();
 
 			var task = CreateTask<CompileAppManifest> ();
-			task.AssemblyName = "AssemblyName";
 			task.AppBundleName = "AppBundleName";
 			task.CompiledAppManifest = new TaskItem (Path.Combine (tmpdir, "TemporaryAppManifest.plist"));
 			task.DefaultSdkVersion = Sdks.GetAppleSdk (platform).GetInstalledSdkVersions (false).First ().ToString ()!;

tests/msbuild/Xamarin.MacDev.Tasks.Tests/TaskTests/CompileAppManifestTaskTests.cs

@@ -41,7 +41,6 @@ protected virtual void ConfigureTask ()
 			Task.ApplicationId = identifier;
 			Task.AppBundleName = appBundleName;
 			Task.CompiledAppManifest = new TaskItem (Path.Combine (Cache.CreateTemporaryDirectory (), "AppBundlePath", "Info.plist"));
-			Task.AssemblyName = assemblyName;
 			Task.AppManifest = new TaskItem (CreateTempFile ("foo.plist"));
 			Task.BundleExecutable = assemblyName;
 			Task.MinSupportedOSPlatformVersion = "10.0";