xamarin
/
xamarin-macios
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

[msbuild] Share the _DetectSdkLocations target. (#8755)

This commit is contained in:
Rolf Bjarne Kvinge 2020-06-05 17:08:02 +02:00 коммит произвёл GitHub
Родитель 3c873f944e
Коммит f80bacf042
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
6 изменённых файлов: 29 добавлений и 53 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

3
msbuild/Xamarin.Mac.Tasks/Tasks/DetectSdkLocations.cs
Просмотреть файл

@ -1,6 +1,3 @@
using System;
using System.Linq;
namespace Xamarin.Mac.Tasks namespace Xamarin.Mac.Tasks
{ {
public class DetectSdkLocations : DetectSdkLocationsTaskBase public class DetectSdkLocations : DetectSdkLocationsTaskBase

19
msbuild/Xamarin.Mac.Tasks/Xamarin.Mac.Common.targets
Просмотреть файл

@ -393,25 +393,6 @@ Copyright (C) 2014 Xamarin. All rights reserved.
</UnpackLibraryResources> </UnpackLibraryResources>
</Target> </Target>
<Target Name="_DetectSdkLocations" DependsOnTargets="_ComputeTargetFrameworkMoniker">
<DetectSdkLocations
SessionId="$(BuildSessionId)"
Condition="'$(IsMacEnabled)' == 'true'"
SdkVersion="$(_SdkVersion)"
TargetFrameworkMoniker="$(_ComputedTargetFrameworkMoniker)"
>
<Output TaskParameter="SdkVersion" PropertyName="_SdkVersion" />
<Output TaskParameter="SdkRoot" PropertyName="_SdkRoot" />
<Output TaskParameter="SdkBinPath" PropertyName="_SdkBinPath" />
<Output TaskParameter="SdkDevPath" PropertyName="_SdkDevPath" />
<Output TaskParameter="SdkUsrPath" PropertyName="_SdkUsrPath" />
<Output TaskParameter="SdkPlatform" PropertyName="_SdkPlatform" />
<Output TaskParameter="SdkIsSimulator" PropertyName="_SdkIsSimulator" />
<Output TaskParameter="IsXcode8" PropertyName="_IsXcode8" />
<Output TaskParameter="XamarinSdkRoot" PropertyName="_XamarinSdkRoot" />
</DetectSdkLocations>
</Target>
<Target Name="_DetectSigningIdentity" DependsOnTargets="_DetectAppManifest;_ComputeTargetFrameworkMoniker"> <Target Name="_DetectSigningIdentity" DependsOnTargets="_DetectAppManifest;_ComputeTargetFrameworkMoniker">
<DetectSigningIdentity <DetectSigningIdentity
Condition="'$(IsMacEnabled)' == 'true'" Condition="'$(IsMacEnabled)' == 'true'"

9
msbuild/Xamarin.MacDev.Tasks.Core/Tasks/DetectSdkLocationCoreTaskBase.cs
Просмотреть файл

@ -5,10 +5,17 @@ using System.Linq;
using Microsoft.Build.Framework; using Microsoft.Build.Framework;
using Xamarin.Localization.MSBuild; using Xamarin.Localization.MSBuild;
using Xamarin.Utils;
namespace Xamarin.MacDev.Tasks { namespace Xamarin.MacDev.Tasks {
public abstract class DetectSdkLocationsCoreTaskBase : XamarinTask { public abstract class DetectSdkLocationsCoreTaskBase : XamarinTask {
#region Inputs
public string TargetArchitectures {
get; set;
}
#endregion Inputs
#region Outputs #region Outputs
[Output] [Output]

21
msbuild/Xamarin.Shared/Xamarin.Shared.targets
Просмотреть файл

@ -155,6 +155,27 @@ Copyright (C) 2018 Microsoft. All rights reserved.
<Error Condition="'$(_AppManifest)' == '' And '$(_CanOutputAppBundle)' == 'true'" Text="Info.plist not found."/> <Error Condition="'$(_AppManifest)' == '' And '$(_CanOutputAppBundle)' == 'true'" Text="Info.plist not found."/>
</Target> </Target>
<Target Name="_DetectSdkLocations" DependsOnTargets="_ComputeTargetArchitectures;_ComputeTargetFrameworkMoniker">
<DetectSdkLocations
SessionId="$(BuildSessionId)"
Condition="'$(IsMacEnabled)' == 'true'"
SdkVersion="$(_SdkVersion)"
TargetFrameworkMoniker="$(_ComputedTargetFrameworkMoniker)"
TargetArchitectures="$(TargetArchitectures)"
>
<Output TaskParameter="SdkVersion" PropertyName="_SdkVersion" />
<Output TaskParameter="SdkRoot" PropertyName="_SdkRoot" />
<Output TaskParameter="SdkBinPath" PropertyName="_SdkBinPath" />
<Output TaskParameter="SdkDevPath" PropertyName="_SdkDevPath" />
<Output TaskParameter="SdkUsrPath" PropertyName="_SdkUsrPath" />
<Output TaskParameter="SdkPlatform" PropertyName="_SdkPlatform" />
<Output TaskParameter="SdkIsSimulator" PropertyName="_SdkIsSimulator" />
<Output TaskParameter="IsXcode8" PropertyName="_IsXcode8" />
<Output TaskParameter="XamarinSdkRoot" PropertyName="_XamarinSdkRoot" />
</DetectSdkLocations>
</Target>
<!-- Code signing --> <!-- Code signing -->
<PropertyGroup> <PropertyGroup>

9
msbuild/Xamarin.iOS.Tasks.Core/Tasks/DetectSdkLocationsTaskBase.cs
Просмотреть файл

@ -2,20 +2,11 @@ using System;
using Xamarin.MacDev.Tasks; using Xamarin.MacDev.Tasks;
using Xamarin.MacDev; using Xamarin.MacDev;
using Xamarin.Utils;
namespace Xamarin.iOS.Tasks namespace Xamarin.iOS.Tasks
{ {
public abstract class DetectSdkLocationsTaskBase : DetectSdkLocationsCoreTaskBase public abstract class DetectSdkLocationsTaskBase : DetectSdkLocationsCoreTaskBase
{ {
#region Inputs
public string TargetArchitectures {
get; set;
}
#endregion Inputs
protected override IAppleSdk CurrentSdk { protected override IAppleSdk CurrentSdk {
get { get {
return IPhoneSdks.GetSdk (Platform); return IPhoneSdks.GetSdk (Platform);

21
msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.Common.targets
Просмотреть файл

@ -582,27 +582,6 @@ Copyright (C) 2013-2016 Xamarin. All rights reserved.
</UnpackLibraryResources> </UnpackLibraryResources>
</Target> </Target>
<Target Name="_DetectSdkLocations" DependsOnTargets="_ComputeTargetArchitectures;_ComputeTargetFrameworkMoniker">
<DetectSdkLocations
SessionId="$(BuildSessionId)"
Condition="'$(IsMacEnabled)' == 'true'"
SdkVersion="$(_SdkVersion)"
TargetFrameworkMoniker="$(_ComputedTargetFrameworkMoniker)"
TargetArchitectures="$(TargetArchitectures)"
>
<Output TaskParameter="SdkVersion" PropertyName="_SdkVersion" />
<Output TaskParameter="SdkRoot" PropertyName="_SdkRoot" />
<Output TaskParameter="SdkBinPath" PropertyName="_SdkBinPath" />
<Output TaskParameter="SdkDevPath" PropertyName="_SdkDevPath" />
<Output TaskParameter="SdkUsrPath" PropertyName="_SdkUsrPath" />
<Output TaskParameter="SdkPlatform" PropertyName="_SdkPlatform" />
<Output TaskParameter="SdkIsSimulator" PropertyName="_SdkIsSimulator" />
<Output TaskParameter="IsXcode8" PropertyName="_IsXcode8" />
<Output TaskParameter="XamarinSdkRoot" PropertyName="_XamarinSdkRoot" />
</DetectSdkLocations>
</Target>
<Target Name="_DetectSigningIdentity" Condition="'$(_CanOutputAppBundle)' == 'true'" DependsOnTargets="_DetectAppManifest;_DetectSdkLocations;_ComputeTargetFrameworkMoniker"> <Target Name="_DetectSigningIdentity" Condition="'$(_CanOutputAppBundle)' == 'true'" DependsOnTargets="_DetectAppManifest;_DetectSdkLocations;_ComputeTargetFrameworkMoniker">
<DetectSigningIdentity <DetectSigningIdentity
SessionId="$(BuildSessionId)" SessionId="$(BuildSessionId)"