Skip to content

[msbuild] Always run WriteItemsFromFile locally. #24211

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
Nov 13, 2025
Merged

[msbuild] Always run WriteItemsFromFile locally. #24211

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
7 changes: 2 additions & 5 deletions dotnet/targets/Xamarin.Shared.Sdk.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1903,7 +1903,6 @@
<!-- When we're building a universal app, we need to collect the list of user frameworks we need to run dsymutil on -->
<Target Name="_CollectRidSpecificUserFrameworksWithoutDebugSymbols">
<ReadItemsFromFile
SessionId="$(BuildSessionId)"
File="%(_RidSpecificUserFrameworksWithoutDebugSymbolsPath.Identity)"
Condition="Exists('%(_RidSpecificUserFrameworksWithoutDebugSymbolsPath.Identity)')"
>
Expand All @@ -1924,9 +1923,8 @@

<!-- Read the stored list of files to sign if we're an outer build of a multi-rid build -->
<ReadItemsFromFile
SessionId="$(BuildSessionId)"
File="%(_RidSpecificCodesignItemsPath.Identity)"
Condition="@(_RidSpecificCodesignItemsPath->Count()) &gt; 0 And '$(IsMacEnabled)' == 'true'"
Condition="@(_RidSpecificCodesignItemsPath->Count()) &gt; 0"
>
<Output TaskParameter="Items" ItemName="_RidSpecificCodesignItems" />
</ReadItemsFromFile>
Expand Down Expand Up @@ -2236,8 +2234,7 @@

<!-- Write a list of files to sign if we're not an outer build of a multi-rid build -->
<WriteItemsToFile
SessionId="$(BuildSessionId)"
Condition="'$(IsMacEnabled)' == 'true' And '$(_CodesignItemsPath)' != ''"
Condition="'$(_CodesignItemsPath)' != ''"
Items="@(_CreateDumpExecutableToSign)"
ItemName="_CodesignItems"
File="$(_CodesignItemsPath)"
Expand Down
13 changes: 1 addition & 12 deletions msbuild/Xamarin.MacDev.Tasks/Tasks/WriteItemsToFile.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,8 @@
using Microsoft.Build.Tasks;
using System.Xml.Linq;

using Xamarin.Messaging.Build.Client;

namespace Xamarin.MacDev.Tasks {
public class WriteItemsToFile : XamarinTask, ICancelableTask {
public class WriteItemsToFile : XamarinTask {
static readonly XNamespace XmlNs = XNamespace.Get ("http://schemas.microsoft.com/developer/msbuild/2003");

static readonly XName ProjectElementName = XmlNs + "Project";
Expand All @@ -36,9 +34,6 @@ public class WriteItemsToFile : XamarinTask, ICancelableTask {

public override bool Execute ()
{
if (ShouldExecuteRemotely ())
return ExecuteRemotely ();

Write (this, File?.ItemSpec, Items, ItemName, Overwrite, IncludeMetadata);
return true;
}
Expand Down Expand Up @@ -83,11 +78,5 @@ static IEnumerable<XElement> CreateMetadataFromItem (ITaskItem item, bool includ

return Enumerable.Empty<XElement> ();
}

public void Cancel ()
{
if (ShouldExecuteRemotely ())
BuildConnection.CancelAsync (BuildEngine4).Wait ();
}
}
}
12 changes: 5 additions & 7 deletions msbuild/Xamarin.Shared/Xamarin.Shared.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ Copyright (C) 2018 Microsoft. All rights reserved.

<RemoveDir SessionId="$(BuildSessionId)" Condition="'$(IsMacEnabled)' == 'true'" Directories="$(AppBundleDir).mSYM;@(_DebugSymbolDir)" />
<Delete SessionId="$(BuildSessionId)" Condition="'$(IsMacEnabled)' == 'true'" Files="$(DeviceSpecificOutputPath)*.bcsymbolmap" />
<Delete SessionId="$(BuildSessionId)" Condition="'$(IsMacEnabled)' == 'true'" Files="$(DeviceSpecificOutputPath)postprocessing.items" />
<Delete Files="$(DeviceSpecificOutputPath)postprocessing.items" />
</Target>

<Target Name="_CleanITunesArtwork" Condition="'$(_CanArchive)' == 'true'" DependsOnTargets="_ComputeTargetArchitectures">
Expand Down Expand Up @@ -405,9 +405,9 @@ Copyright (C) 2018 Microsoft. All rights reserved.
<_IpaPackageFile Include="$(DeviceSpecificOutputPath)*.ipa" />
</ItemGroup>

<Delete Condition="'$(IsMacEnabled)' == 'true'" Files="$(DeviceSpecificOutputPath)codesign.items" />
<Delete Condition="'$(IsMacEnabled)' == 'true'" Files="$(DeviceSpecificOutputPath)codesign-bundle.items" />
<Delete SessionId="$(BuildSessionId)" Condition="'$(IsMacEnabled)' == 'true'" Files="$(DeviceSpecificOutputPath)native-frameworks.items" />
<Delete Files="$(DeviceSpecificOutputPath)codesign.items" />
<Delete Files="$(DeviceSpecificOutputPath)codesign-bundle.items" />
<Delete Files="$(DeviceSpecificOutputPath)native-frameworks.items" />
<Delete SessionId="$(BuildSessionId)" Condition="'$(IsMacEnabled)' == 'true'" Files="@(_IpaPackageFile)" />
</Target>

Expand Down Expand Up @@ -2529,7 +2529,6 @@ Copyright (C) 2018 Microsoft. All rights reserved.
>

<WriteItemsToFile
Condition="'$(IsMacEnabled)' == 'true'"
Items="@(_CodesignBundle)"
ItemName="_CodesignBundle"
File="$(DeviceSpecificOutputPath)codesign-bundle.items"
Expand All @@ -2538,7 +2537,6 @@ Copyright (C) 2018 Microsoft. All rights reserved.
/>

<WriteItemsToFile
Condition="'$(IsMacEnabled)' == 'true'"
Items="@(_CodesignItems)"
ItemName="_CodesignItems"
File="$(DeviceSpecificOutputPath)codesign.items"
Expand Down Expand Up @@ -2994,7 +2992,7 @@ Copyright (C) 2018 Microsoft. All rights reserved.
>

<WriteItemsToFile
Condition="'$(IsMacEnabled)' == 'true' And '$(_PostProcessingItemPath)' != ''"
Condition="'$(_PostProcessingItemPath)' != ''"
Items="@(_PostProcessingItem)"
ItemName="_PostProcessingItem"
File="$(_PostProcessingItemPath)"
Expand Down