Skip to content

[msbuild] Merge the CodesignNativeLibraries task into the Codesign task. #9731

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rolfbjarne merged 1 commit into from
Sep 30, 2020
Merged

[msbuild] Merge the CodesignNativeLibraries task into the Codesign task. #9731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 31 additions & 3 deletions msbuild/Xamarin.MacDev.Tasks.Core/Tasks/CodesignTaskBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ public abstract class CodesignTaskBase : XamarinTask

#region Inputs

public string StampPath { get; set; }

[Required]
public string CodesignAllocate { get; set; }

Expand Down Expand Up @@ -86,6 +88,27 @@ ProcessStartInfo GetProcessStartInfo (string tool, string args)
return startInfo;
}

string GetOutputPath (ITaskItem item)
{
return Path.Combine (StampPath, item.ItemSpec);
}

bool NeedsCodesign (ITaskItem item)
{
if (string.IsNullOrEmpty (StampPath))
return true;

var output = GetOutputPath (item);

if (!File.Exists (output))
return true;

if (File.GetLastWriteTimeUtc (item.ItemSpec) >= File.GetLastWriteTimeUtc (output))
return true;

return false;
}

string GenerateCommandLineArguments (ITaskItem item)
{
var args = new CommandLineArgumentBuilder ();
Expand Down Expand Up @@ -164,9 +187,13 @@ void Codesign (ITaskItem item)

if (exitCode != 0) {
if (errors.Length > 0)
Log.LogError (null, null, null, item.ItemSpec, 0, 0, 0, 0, "{0}", errors);
Log.LogError (MSBStrings.E0004, item.ItemSpec, errors);
else
Log.LogError (null, null, null, item.ItemSpec, 0, 0, 0, 0, MSBStrings.E0098, startInfo.FileName);
Log.LogError (MSBStrings.E0005, item.ItemSpec);
} else if (!string.IsNullOrEmpty (StampPath)) {
var outputPath = GetOutputPath (item);
Directory.CreateDirectory (Path.GetDirectoryName (outputPath));
File.WriteAllText (outputPath, string.Empty);
}
}

Expand All @@ -176,8 +203,9 @@ public override bool Execute ()
return true;

var codesignedFiles = new List<ITaskItem> ();
var resourcesToSign = Resources.Where (v => NeedsCodesign (v));

Parallel.ForEach (Resources, new ParallelOptions { MaxDegreeOfParallelism = Math.Max (Environment.ProcessorCount / 2, 1) }, (item) => {
Parallel.ForEach (resourcesToSign, new ParallelOptions { MaxDegreeOfParallelism = Math.Max (Environment.ProcessorCount / 2, 1) }, (item) => {
Codesign (item);

var files = GetCodesignedFiles (item);
Expand Down
1 change: 0 additions & 1 deletion msbuild/Xamarin.Shared/Xamarin.Shared.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ Copyright (C) 2018 Microsoft. All rights reserved.
<UsingTask Condition="'$(_PlatformName)' != 'macOS'" TaskName="Xamarin.iOS.Tasks.ALToolValidate" AssemblyFile="$(_TaskAssemblyName)" />
<UsingTask Condition="'$(_PlatformName)' != 'macOS'" TaskName="Xamarin.iOS.Tasks.Archive" AssemblyFile="$(_TaskAssemblyName)" />
<UsingTask Condition="'$(_PlatformName)' != 'macOS'" TaskName="Xamarin.iOS.Tasks.BTouch" AssemblyFile="$(_TaskAssemblyName)" />
<UsingTask Condition="'$(_PlatformName)' != 'macOS'" TaskName="Xamarin.iOS.Tasks.CodesignNativeLibraries" AssemblyFile="$(_TaskAssemblyName)" />
<UsingTask Condition="'$(_PlatformName)' != 'macOS'" TaskName="Xamarin.iOS.Tasks.CodesignVerify" AssemblyFile="$(_TaskAssemblyName)" />
<UsingTask Condition="'$(_PlatformName)' != 'macOS'" TaskName="Xamarin.iOS.Tasks.CollectAssetPacks" AssemblyFile="$(_TaskAssemblyName)" />
<UsingTask Condition="'$(_PlatformName)' != 'macOS'" TaskName="Xamarin.iOS.Tasks.CollectFrameworks" AssemblyFile="$(_TaskAssemblyName)" />
Expand Down
200 changes: 0 additions & 200 deletions msbuild/Xamarin.iOS.Tasks.Core/Tasks/CodesignNativeLibrariesTaskBase.cs
View file
Open in desktop

This file was deleted.

35 changes: 27 additions & 8 deletions msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.Common.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1383,20 +1383,27 @@ Copyright (C) 2013-2016 Xamarin. All rights reserved.
<_LibraryCodeSigningKey Condition="'$(_LibraryCodeSigningKey)' == ''">-</_LibraryCodeSigningKey>
</PropertyGroup>

<CodesignNativeLibraries
<ItemGroup>
<_CodesignNativeLibrary
Include="$(_AppBundlePath)\**\*.dylib;$(_AppBundlePath)\**\*.metallib"
Exclude="$(_AppBundlePath)\Watch\**;$(_AppBundlePath)\PlugIns\**"
/>
</ItemGroup>

<Codesign
Condition="'$(IsMacEnabled)' == 'true'"
SessionId="$(BuildSessionId)"
ToolExe="$(CodesignExe)"
ToolPath="$(CodesignPath)"
AppBundleDir="$(AppBundleDir)"
IntermediateOutputPath="$(DeviceSpecificIntermediateOutputPath)codesign"
CodesignAllocate="$(_CodesignAllocate)"
DisableTimestamp="$(_CodesignDisableTimestamp)"
Keychain="$(CodesignKeychain)"
Resources="@(_CodesignNativeLibrary)"
SigningKey="$(_LibraryCodeSigningKey)"
StampPath="$(DeviceSpecificIntermediateOutputPath)codesign"
ExtraArgs="$(CodesignExtraArgs)"
>
</CodesignNativeLibraries>
</Codesign>
</Target>

<Target Name="_CodesignFrameworks" Condition="'$(_CanOutputAppBundle)' == 'true' And '@(_Frameworks)' != ''" DependsOnTargets="_DetectSigningIdentity;_CollectFrameworks"
Expand Down Expand Up @@ -1446,20 +1453,32 @@ Copyright (C) 2013-2016 Xamarin. All rights reserved.
Inputs="$(_AppBundlePath)PlugIns\%(_AppExtensionCodesignProperties.Identity)\%(_AppExtensionCodesignProperties.NativeExecutable);%(_AppExtensionCodesignProperties.CodesignAppExtensionInputs)"
Outputs="$(_AppBundlePath)PlugIns\%(_AppExtensionCodesignProperties.Identity)\_CodeSignature\CodeResources">

<CodesignNativeLibraries
<PropertyGroup>
<_CodesignAppExtensionsLibraryPath>$(_AppBundlePath)PlugIns\%(_AppExtensionCodesignProperties.Identity)\</_CodesignAppExtensionsLibraryPath>
</PropertyGroup>

<ItemGroup>
<_CodesignAppExtensionsLibrary
Include="$(_CodesignAppExtensionsLibraryPath)**\*.dylib;$(_CodesignAppExtensionsLibraryPath)**\*.metallib"
Exclude="$(_CodesignAppExtensionsLibraryPath)Watch\**;$(_CodesignAppExtensionsLibraryPath)PlugIns\**"
>
</_CodesignAppExtensionsLibrary>
</ItemGroup>

<Codesign
SessionId="$(BuildSessionId)"
Condition="'$(IsMacEnabled)' == 'true' And '%(_AppExtensionCodesignProperties.LibrarySigningKey)' != ''"
ToolExe="$(CodesignExe)"
ToolPath="$(CodesignPath)"
AppBundleDir="$(_AppBundlePath)PlugIns\%(_AppExtensionCodesignProperties.Identity)"
IntermediateOutputPath="$(DeviceSpecificIntermediateOutputPath)codesign\PlugIns\%(_AppExtensionCodesignProperties.Identity)"
Resources="@(_CodesignAppExtensionsLibrary)"
CodesignAllocate="%(_AppExtensionCodesignProperties.CodesignAllocate)"
DisableTimestamp="%(_AppExtensionCodesignProperties.DisableTimestamp)"
Keychain="%(_AppExtensionCodesignProperties.Keychain)"
SigningKey="%(_AppExtensionCodesignProperties.LibrarySigningKey)"
StampPath="$(DeviceSpecificIntermediateOutputPath)codesign\PlugIns\%(_AppExtensionCodesignProperties.Identity)"
ExtraArgs="%(_AppExtensionCodesignProperties.ExtraArgs)"
>
</CodesignNativeLibraries>
</Codesign>

<Codesign
SessionId="$(BuildSessionId)"
Expand Down
6 changes: 0 additions & 6 deletions msbuild/Xamarin.iOS.Tasks/Tasks/CodesignNativeLibraries.cs
View file
Open in desktop

This file was deleted.