[msbuild] Move debug-related targets to shared code. (#14180)
This commit is contained in:
Родитель
2140d46327
Коммит
21d7dd8de3
|
@ -244,7 +244,7 @@
|
|||
</CreateAppBundleDependsOn>
|
||||
|
||||
<!-- not inner build for multi-rid build (single-rid build or outer build for multi-rid build) -->
|
||||
<CreateAppBundleDependsOn Condition="'$(_PlatformName)' != 'macOS' And '$(_IsMultiRidBuild)' != 'true'">
|
||||
<CreateAppBundleDependsOn Condition="'$(_IsMultiRidBuild)' != 'true'">
|
||||
_CreateDebugSettings;
|
||||
_CreateDebugConfiguration;
|
||||
$(CreateAppBundleDependsOn);
|
||||
|
|
|
@ -8,7 +8,7 @@ using Microsoft.Build.Utilities;
|
|||
|
||||
using Xamarin.MacDev.Tasks;
|
||||
|
||||
namespace Xamarin.iOS.Tasks
|
||||
namespace Xamarin.MacDev.Tasks
|
||||
{
|
||||
public abstract class CreateDebugConfigurationTaskBase : XamarinTask
|
||||
{
|
|
@ -9,7 +9,7 @@ using Xamarin.MacDev.Tasks;
|
|||
using Xamarin.MacDev;
|
||||
using Xamarin.Localization.MSBuild;
|
||||
|
||||
namespace Xamarin.iOS.Tasks
|
||||
namespace Xamarin.MacDev.Tasks
|
||||
{
|
||||
public abstract class CreateDebugSettingsTaskBase : XamarinTask
|
||||
{
|
|
@ -12,7 +12,7 @@ using Xamarin.MacDev.Tasks;
|
|||
using Xamarin.MacDev;
|
||||
using Xamarin.Localization.MSBuild;
|
||||
|
||||
namespace Xamarin.iOS.Tasks
|
||||
namespace Xamarin.MacDev.Tasks
|
||||
{
|
||||
public abstract class DetectDebugNetworkConfigurationBase : XamarinTask
|
||||
{
|
|
@ -1,7 +1,7 @@
|
|||
using Microsoft.Build.Framework;
|
||||
using Xamarin.Messaging.Build.Client;
|
||||
|
||||
namespace Xamarin.iOS.Tasks
|
||||
namespace Xamarin.MacDev.Tasks
|
||||
{
|
||||
public class CreateDebugConfiguration : CreateDebugConfigurationTaskBase, ICancelableTask
|
||||
{
|
|
@ -1,7 +1,7 @@
|
|||
using Microsoft.Build.Framework;
|
||||
using Xamarin.Messaging.Build.Client;
|
||||
|
||||
namespace Xamarin.iOS.Tasks
|
||||
namespace Xamarin.MacDev.Tasks
|
||||
{
|
||||
public class CreateDebugSettings : CreateDebugSettingsTaskBase, ICancelableTask
|
||||
{
|
|
@ -1,7 +1,7 @@
|
|||
using Microsoft.Build.Framework;
|
||||
using Xamarin.Messaging.Build.Client;
|
||||
|
||||
namespace Xamarin.iOS.Tasks
|
||||
namespace Xamarin.MacDev.Tasks
|
||||
{
|
||||
public class DetectDebugNetworkConfiguration : DetectDebugNetworkConfigurationBase, ICancelableTask
|
||||
{
|
|
@ -41,10 +41,7 @@ Copyright (C) 2018 Microsoft. All rights reserved.
|
|||
<UsingTask Condition="'$(_PlatformName)' != 'macOS'" TaskName="Xamarin.iOS.Tasks.CompileITunesMetadata" AssemblyFile="$(_TaskAssemblyName)" />
|
||||
<UsingTask Condition="'$(_PlatformName)' != 'macOS'" TaskName="Xamarin.iOS.Tasks.CompileSceneKitAssets" AssemblyFile="$(_TaskAssemblyName)" />
|
||||
<UsingTask Condition="'$(_PlatformName)' != 'macOS'" TaskName="Xamarin.iOS.Tasks.CreateAssetPack" AssemblyFile="$(_TaskAssemblyName)" />
|
||||
<UsingTask Condition="'$(_PlatformName)' != 'macOS'" TaskName="Xamarin.iOS.Tasks.CreateDebugConfiguration" AssemblyFile="$(_TaskAssemblyName)" />
|
||||
<UsingTask Condition="'$(_PlatformName)' != 'macOS'" TaskName="Xamarin.iOS.Tasks.CreateDebugSettings" AssemblyFile="$(_TaskAssemblyName)" />
|
||||
<UsingTask Condition="'$(_PlatformName)' != 'macOS'" TaskName="Xamarin.iOS.Tasks.CreateEmbeddedResources" AssemblyFile="$(_TaskAssemblyName)" />
|
||||
<UsingTask Condition="'$(_PlatformName)' != 'macOS'" TaskName="Xamarin.iOS.Tasks.DetectDebugNetworkConfiguration" AssemblyFile="$(_TaskAssemblyName)" />
|
||||
<UsingTask Condition="'$(_PlatformName)' != 'macOS'" TaskName="Xamarin.iOS.Tasks.DetectSdkLocations" AssemblyFile="$(_TaskAssemblyName)" />
|
||||
<UsingTask Condition="'$(_PlatformName)' != 'macOS'" TaskName="Xamarin.iOS.Tasks.DetectSigningIdentity" AssemblyFile="$(_TaskAssemblyName)" />
|
||||
<UsingTask Condition="'$(_PlatformName)' != 'macOS'" TaskName="Xamarin.iOS.Tasks.FindWatchOS2AppBundle" AssemblyFile="$(_TaskAssemblyName)" />
|
||||
|
@ -85,9 +82,12 @@ Copyright (C) 2018 Microsoft. All rights reserved.
|
|||
<UsingTask TaskName="Xamarin.MacDev.Tasks.CoreMLCompiler" AssemblyFile="$(_TaskAssemblyName)" />
|
||||
<UsingTask TaskName="Xamarin.MacDev.Tasks.CreateAssetPackManifest" AssemblyFile="$(_TaskAssemblyName)" />
|
||||
<UsingTask TaskName="Xamarin.MacDev.Tasks.CreateBindingResourcePackage" AssemblyFile="$(_TaskAssemblyName)" />
|
||||
<UsingTask TaskName="Xamarin.MacDev.Tasks.CreateDebugConfiguration" AssemblyFile="$(_TaskAssemblyName)" />
|
||||
<UsingTask TaskName="Xamarin.MacDev.Tasks.CreateDebugSettings" AssemblyFile="$(_TaskAssemblyName)" />
|
||||
<UsingTask TaskName="Xamarin.MacDev.Tasks.CreateInstallerPackage" AssemblyFile="$(_TaskAssemblyName)" />
|
||||
<UsingTask TaskName="Xamarin.MacDev.Tasks.CreatePkgInfo" AssemblyFile="$(_TaskAssemblyName)" />
|
||||
<UsingTask TaskName="Xamarin.MacDev.Tasks.CompileProductDefinition" AssemblyFile="$(_TaskAssemblyName)" />
|
||||
<UsingTask TaskName="Xamarin.MacDev.Tasks.DetectDebugNetworkConfiguration" AssemblyFile="$(_TaskAssemblyName)" />
|
||||
<UsingTask TaskName="Xamarin.MacDev.Tasks.Ditto" AssemblyFile="$(_TaskAssemblyName)" />
|
||||
<UsingTask TaskName="Xamarin.MacDev.Tasks.DSymUtil" AssemblyFile="$(_TaskAssemblyName)" />
|
||||
<UsingTask TaskName="Xamarin.MacDev.Tasks.EmbedProvisionProfile" AssemblyFile="$(_TaskAssemblyName)" />
|
||||
|
@ -2470,6 +2470,47 @@ Copyright (C) 2018 Microsoft. All rights reserved.
|
|||
</SpotlightIndexer>
|
||||
</Target>
|
||||
|
||||
<Target Name="_CreateDebugSettings" Condition="'$(_BundlerDebug)' == 'true' And '$(IsWatchApp)' == 'false' And '$(_PlatformName)' != 'MacCatalyst' And '$(_PlatformName)' != 'macOS'"
|
||||
DependsOnTargets="_CopyResourcesToBundle"
|
||||
Outputs="$(_AppBundlePath)Settings.bundle\Root.plist" >
|
||||
<CreateDebugSettings
|
||||
SessionId="$(BuildSessionId)"
|
||||
Condition="'$(IsMacEnabled)' == 'true'"
|
||||
AppBundleDir="$(AppBundleDir)"
|
||||
DebuggerPort="$(IOSDebuggerPort)"
|
||||
>
|
||||
</CreateDebugSettings>
|
||||
</Target>
|
||||
|
||||
<Target Name="_CreateDebugConfiguration" Condition="'$(_BundlerDebug)' == 'true' And '$(IsWatchApp)' == 'false' And '$(_PlatformName)' != 'macOS'"
|
||||
DependsOnTargets="_CopyResourcesToBundle;_DetectDebugNetworkConfiguration"
|
||||
Outputs="$(_AppResourcesPath)MonoTouchDebugConfiguration.txt" >
|
||||
<MakeDir SessionId="$(BuildSessionId)" Condition="'$(IsMacEnabled)' == 'true'" Directories="$(_AppResourcesPath)" />
|
||||
<CreateDebugConfiguration
|
||||
SessionId="$(BuildSessionId)"
|
||||
Condition="'$(IsMacEnabled)' == 'true'"
|
||||
AppBundleDir="$(_AppResourcesPath)"
|
||||
DebugOverWiFi="$(IOSDebugOverWiFi)"
|
||||
DebugIPAddresses="$(_DebugIPAddresses)"
|
||||
DebuggerPort="$(IOSDebuggerPort)"
|
||||
SdkIsSimulator="$(_SdkIsSimulator)"
|
||||
>
|
||||
</CreateDebugConfiguration>
|
||||
</Target>
|
||||
|
||||
<Target Name="_DetectDebugNetworkConfiguration" Condition="'$(_BundlerDebug)' == 'true'">
|
||||
<DetectDebugNetworkConfiguration
|
||||
SessionId="$(BuildSessionId)"
|
||||
Condition="'$(IsMacEnabled)' == 'true'"
|
||||
DebugOverWiFi="$(IOSDebugOverWiFi)"
|
||||
DebuggerHosts="$(IOSDebuggerHosts)"
|
||||
SdkIsSimulator="$(_SdkIsSimulator)"
|
||||
>
|
||||
|
||||
<Output TaskParameter="DebugIPAddresses" PropertyName="_DebugIPAddresses" />
|
||||
</DetectDebugNetworkConfiguration>
|
||||
</Target>
|
||||
|
||||
<PropertyGroup>
|
||||
<ArchiveDependsOn>
|
||||
_CoreArchive
|
||||
|
|
|
@ -292,47 +292,6 @@ Copyright (C) 2013-2016 Xamarin. All rights reserved.
|
|||
</Touch>
|
||||
</Target>
|
||||
|
||||
<Target Name="_CreateDebugSettings" Condition="'$(_BundlerDebug)' == 'true' And '$(IsWatchApp)' == 'false' And '$(_PlatformName)' != 'MacCatalyst'"
|
||||
DependsOnTargets="_CopyResourcesToBundle"
|
||||
Outputs="$(_AppBundlePath)Settings.bundle\Root.plist" >
|
||||
<CreateDebugSettings
|
||||
SessionId="$(BuildSessionId)"
|
||||
Condition="'$(IsMacEnabled)' == 'true'"
|
||||
AppBundleDir="$(AppBundleDir)"
|
||||
DebuggerPort="$(IOSDebuggerPort)"
|
||||
>
|
||||
</CreateDebugSettings>
|
||||
</Target>
|
||||
|
||||
<Target Name="_CreateDebugConfiguration" Condition="'$(_BundlerDebug)' == 'true' And '$(IsWatchApp)' == 'false'"
|
||||
DependsOnTargets="_CopyResourcesToBundle;_DetectDebugNetworkConfiguration"
|
||||
Outputs="$(_AppResourcesPath)MonoTouchDebugConfiguration.txt" >
|
||||
<MakeDir SessionId="$(BuildSessionId)" Condition="'$(IsMacEnabled)' == 'true'" Directories="$(_AppResourcesPath)" />
|
||||
<CreateDebugConfiguration
|
||||
SessionId="$(BuildSessionId)"
|
||||
Condition="'$(IsMacEnabled)' == 'true'"
|
||||
AppBundleDir="$(_AppResourcesPath)"
|
||||
DebugOverWiFi="$(IOSDebugOverWiFi)"
|
||||
DebugIPAddresses="$(_DebugIPAddresses)"
|
||||
DebuggerPort="$(IOSDebuggerPort)"
|
||||
SdkIsSimulator="$(_SdkIsSimulator)"
|
||||
>
|
||||
</CreateDebugConfiguration>
|
||||
</Target>
|
||||
|
||||
<Target Name="_DetectDebugNetworkConfiguration" Condition="'$(_BundlerDebug)' == 'true'">
|
||||
<DetectDebugNetworkConfiguration
|
||||
SessionId="$(BuildSessionId)"
|
||||
Condition="'$(IsMacEnabled)' == 'true'"
|
||||
DebugOverWiFi="$(IOSDebugOverWiFi)"
|
||||
DebuggerHosts="$(IOSDebuggerHosts)"
|
||||
SdkIsSimulator="$(_SdkIsSimulator)"
|
||||
>
|
||||
|
||||
<Output TaskParameter="DebugIPAddresses" PropertyName="_DebugIPAddresses" />
|
||||
</DetectDebugNetworkConfiguration>
|
||||
</Target>
|
||||
|
||||
<Target Name="_ValidateAppBundle" Condition="'$(IsAppExtension)' == 'false' And '$(IsWatchApp)' == 'false'" DependsOnTargets="_DetectSdkLocations;_ComputeTargetFrameworkMoniker;_GenerateBundleName">
|
||||
<ValidateAppBundleTask
|
||||
Condition="'$(IsMacEnabled)' == 'true'"
|
||||
|
|
Загрузка…
Ссылка в новой задаче