Skip to content

[Windows] Make LinkNativeCode create output file #23534

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
emaf merged 1 commit into from
Aug 11, 2025
Merged

[Windows] Make LinkNativeCode create output file #23534

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
3 changes: 1 addition & 2 deletions dotnet/targets/Xamarin.Shared.Sdk.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1686,7 +1686,7 @@
<_NativeReferences Include="@(_FileNativeReference)" Condition="'%(_FileNativeReference.LinkToExecutable)' != 'false'" />
</ItemGroup>

<WriteLinesToFile SessionId="$(BuildSessionId)" File="$(_MtouchSymbolsList)" Lines="@(_ProcessedReferenceNativeSymbol)" Overwrite="true" />
<WriteLinesToFile File="$(_MtouchSymbolsList)" Lines="@(_ProcessedReferenceNativeSymbol)" Overwrite="true" />

<PropertyGroup>
<!-- There are known bugs in the classic linker with Xcode 15, so keep use the classic linker in that case -->
Expand Down Expand Up @@ -1859,7 +1859,6 @@
<Output TaskParameter="Lines" ItemName="_AllExecutableSymbols" />
</ReadLinesFromFile>
<WriteLinesToFile
SessionId="$(BuildSessionId)"
File="$(_MtouchSymbolsList)"
Lines="@(_AllExecutableSymbols->DistinctWithCase())"
Overwrite="true" />
Expand Down
9 changes: 5 additions & 4 deletions msbuild/Xamarin.MacDev.Tasks/Tasks/LinkNativeCode.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ public class LinkNativeCode : XamarinTask, ITaskCallback {
public string SdkRoot { get; set; } = string.Empty;

[Required]
public string OutputFile { get; set; } = string.Empty;
[Output]
public ITaskItem OutputFile { get; set; } = null!;

[Required]
public ITaskItem [] ObjectFiles { get; set; } = Array.Empty<ITaskItem> ();
Expand All @@ -56,7 +57,7 @@ public class LinkNativeCode : XamarinTask, ITaskCallback {
public override bool Execute ()
{
if (ShouldExecuteRemotely ()) {
outputPath = PathUtils.ConvertToMacPath (Path.GetDirectoryName (OutputFile));
outputPath = PathUtils.ConvertToMacPath (Path.GetDirectoryName (OutputFile.ItemSpec));

return new TaskRunner (SessionId, BuildEngine4).RunAsync (this).Result;
}
Expand Down Expand Up @@ -205,7 +206,7 @@ bool ExecuteUnsafe ()
arguments.AddRange (GetEmbedEntitlementsWithDerInExecutableLinkerFlags (EntitlementsInExecutable));

arguments.Add ("-o");
arguments.Add (Path.GetFullPath (OutputFile));
arguments.Add (Path.GetFullPath (OutputFile.ItemSpec));

if (LinkerFlags is not null) {
foreach (var flag in LinkerFlags)
Expand Down Expand Up @@ -306,7 +307,7 @@ static bool EntitlementsRequireLinkerFlags (string path)
// and the ones on Windows are empty, so we will break the build
public bool ShouldCopyToBuildServer (ITaskItem item) => !PathUtils.ConvertToMacPath (item.ItemSpec).StartsWith (outputPath);

public bool ShouldCreateOutputFile (ITaskItem item) => false;
public bool ShouldCreateOutputFile (ITaskItem item) => true;

public IEnumerable<ITaskItem> GetAdditionalItemsToBeCopied () => Enumerable.Empty<ITaskItem> ();
}
Expand Down