@@ -34,21 +34,13 @@ public class CompileAppManifest : XamarinTask, IHasProjectDir, IHasResourcePrefi
3434 // This must be an ITaskItem to copy the file to Windows for remote builds.
3535 public ITaskItem ? AppManifest { get ; set ; }
3636
37- [ Required ]
38- public string AssemblyName { get ; set ; } = String . Empty ;
39-
4037 [ Required ]
4138 public string BundleExecutable { get ; set ; } = "" ;
4239
4340 [ Required ]
4441 [ Output ] // This is required to create an empty file on Windows for the Input/Outputs check.
4542 public ITaskItem ? CompiledAppManifest { get ; set ; }
4643
47- [ Required ]
48- public bool Debug { get ; set ; }
49-
50- public string DebugIPAddresses { get ; set ; } = String . Empty ;
51-
5244 public string DefaultSdkVersion { get ; set ; } = String . Empty ;
5345
5446 public ITaskItem [ ] FontFilesToRegister { get ; set ; } = Array . Empty < ITaskItem > ( ) ;
@@ -59,12 +51,6 @@ public class CompileAppManifest : XamarinTask, IHasProjectDir, IHasResourcePrefi
5951 [ Required ]
6052 public bool IsAppExtension { get ; set ; }
6153
62- public bool IsXPCService { get ; set ; }
63-
64- public bool IsWatchApp { get ; set ; }
65-
66- public bool IsWatchExtension { get ; set ; }
67-
6854 [ Required ]
6955 public string MinSupportedOSPlatformVersion { get ; set ; } = string . Empty ;
7056
@@ -183,8 +169,6 @@ public override bool Execute ()
183169 void AddXamarinVersionNumber ( PDictionary plist )
184170 {
185171 // Add our own version number
186- if ( IsWatchApp )
187- return ;
188172
189173 // This key is our supported way of determining if an app
190174 // was built with Xamarin, so it needs to be present in all apps.
@@ -479,9 +463,6 @@ void Validation (PDictionary plist)
479463
480464 bool CompileMac ( PDictionary plist )
481465 {
482- if ( ! IsAppExtension || ( IsAppExtension && IsXPCService ) )
483- plist . SetIfNotPresent ( "MonoBundleExecutable" , AssemblyName + ".exe" ) ;
484-
485466 return ! Log . HasLoggedErrors ;
486467 }
487468
@@ -512,11 +493,6 @@ bool CompileMobile (PDictionary plist)
512493
513494 SetDeviceFamily ( plist ) ;
514495
515- if ( IsWatchExtension ) {
516- if ( Debug )
517- SetAppTransportSecurity ( plist ) ;
518- }
519-
520496 SetRequiredArchitectures ( plist ) ;
521497
522498 return ! Log . HasLoggedErrors ;
@@ -531,7 +507,7 @@ void SetXcodeValues (PDictionary plist, IAppleSdk currentSDK)
531507 SetValueIfNotNull ( plist , "DTCompiler" , sdkSettings . DTCompiler ) ;
532508 SetValueIfNotNull ( plist , "DTPlatformBuild" , dtSettings . DTPlatformBuild ) ;
533509 SetValueIfNotNull ( plist , "DTSDKBuild" , sdkSettings . DTSDKBuild ) ;
534- SetValueIfNotNull ( plist , "DTPlatformName" , PlatformUtils . GetTargetPlatform ( SdkPlatform , IsWatchApp ) ) ;
510+ SetValueIfNotNull ( plist , "DTPlatformName" , PlatformUtils . GetTargetPlatform ( SdkPlatform , false ) ) ;
535511 SetValueIfNotNull ( plist , "DTPlatformVersion" , dtSettings . DTPlatformVersion ) ;
536512 SetValueIfNotNull ( plist , "DTSDKName" , sdkSettings . CanonicalName ) ;
537513 SetValueIfNotNull ( plist , "DTXcode" , AppleSdkSettings . DTXcode ) ;
@@ -632,31 +608,6 @@ void SetDeviceFamily (PDictionary plist)
632608 plist . SetUIDeviceFamily ( uiDeviceFamily ) ;
633609 }
634610
635- void SetAppTransportSecurity ( PDictionary plist )
636- {
637- // Debugging over http has a couple of gotchas:
638- // * We can't use https, because that requires a valid server certificate,
639- // which we can't ensure.
640- // It would also require a hostname for the mac, which it might not have either.
641- // * NSAppTransportSecurity/NSExceptionDomains does not allow exceptions based
642- // on IP address (only hostname).
643- // Good news: watchOS 3 will apparently not apply ATS when connecting
644- // directly to IP addresses, which means we won't have to do this at all
645- // (sometime in the future).
646-
647- PDictionary ? ats ;
648-
649- if ( ! plist . TryGetValue ( ManifestKeys . NSAppTransportSecurity , out ats ) )
650- plist . Add ( ManifestKeys . NSAppTransportSecurity , ats = new PDictionary ( ) ) ;
651-
652- if ( ats . GetBoolean ( ManifestKeys . NSAllowsArbitraryLoads ) ) {
653- Log . LogMessage ( MessageImportance . Low , MSBStrings . M0017 ) ;
654- } else {
655- Log . LogMessage ( MessageImportance . Low , MSBStrings . M0018 ) ;
656- ats . SetBooleanOrRemove ( ManifestKeys . NSAllowsArbitraryLoads , true ) ;
657- }
658- }
659-
660611 public bool ShouldCopyToBuildServer ( ITaskItem item )
661612 {
662613 // We don't want to copy partial generated manifest files unless they exist and have a non-zero length
0 commit comments