Skip to content

Fix XcodeProject output path when using artifacts folder #24224

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

Draft
wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

Fix XcodeProject output path when using artifacts folder #24224

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9e9c3b3
Initial plan
Copilot Nov 12, 2025
dd792ca
Fix XcodeProject output path for artifacts mode
Copilot Nov 12, 2025
ad5a54f
Convert paths to absolute in C# tasks instead of MSBuild targets
Copilot Nov 20, 2025
bcefb10
Remove MSBuildProjectDirectory prefix from targets file
Copilot Nov 21, 2025
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
2 changes: 1 addition & 1 deletion dotnet/targets/Microsoft.MaciOS.Sdk.Xcode.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ This file contains MSBuild targets that support building Xcode framework project
<UsingTask TaskName="Xamarin.MacDev.Tasks.CreateXcFramework" AssemblyFile="$(_XamarinTaskAssembly)"/>

<PropertyGroup>
<_XcodeProjectDefaultOutputPathRoot>$(IntermediateOutputPath)xcode/</_XcodeProjectDefaultOutputPathRoot>
<_XcodeProjectDefaultOutputPathRoot>$(MSBuildProjectDirectory)/$(IntermediateOutputPath)xcode/</_XcodeProjectDefaultOutputPathRoot>
Copy link
Member

@rolfbjarne rolfbjarne Nov 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@copilot this change is still needed, please put it back

Copy link
Contributor Author

Copilot AI Nov 21, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done. Restored the removal of $(MSBuildProjectDirectory)/ prefix from the targets file while keeping the Path.GetFullPath() calls in the C# tasks. Both changes are now in place. Commit: bcefb10

<_BuildXcodeProjectsStamp>$(_MaciOSStampDirectory)_BuildXcodeProjects.stamp</_BuildXcodeProjectsStamp>
</PropertyGroup>

Expand Down
6 changes: 3 additions & 3 deletions msbuild/Xamarin.MacDev.Tasks/Tasks/CreateXcArchive.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,17 +57,17 @@ protected override IList<string> GenerateCommandLineCommands ()

if (!string.IsNullOrEmpty (OutputPath)) {
args.Add ("-archivePath");
args.Add (OutputPath);
args.Add (Path.GetFullPath (OutputPath));
}

if (!string.IsNullOrEmpty (DerivedDataPath)) {
args.Add ("-derivedDataPath");
args.Add (DerivedDataPath);
args.Add (Path.GetFullPath (DerivedDataPath));
}

if (!string.IsNullOrEmpty (PackageCachePath)) {
args.Add ("-packageCachePath");
args.Add (PackageCachePath);
args.Add (Path.GetFullPath (PackageCachePath));
}

args.AddRange (archive_args);
Expand Down
7 changes: 4 additions & 3 deletions msbuild/Xamarin.MacDev.Tasks/Tasks/CreateXcFramework.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,9 @@ protected override IList<string> GenerateCommandLineCommands ()
{
var args = new List<string> ();

if (Directory.Exists (XcArchivePath)) {
foreach (var frameworkArchive in Directory.EnumerateDirectories (XcArchivePath, "*.xcarchive")) {
var fullXcArchivePath = Path.GetFullPath (XcArchivePath);
if (Directory.Exists (fullXcArchivePath)) {
foreach (var frameworkArchive in Directory.EnumerateDirectories (fullXcArchivePath, "*.xcarchive")) {
args.Add ("-archive");
args.Add (frameworkArchive);
args.Add ("-framework");
Expand All @@ -32,7 +33,7 @@ protected override IList<string> GenerateCommandLineCommands ()

if (!string.IsNullOrEmpty (OutputPath)) {
args.Add ("-output");
args.Add (OutputPath);
args.Add (Path.GetFullPath (OutputPath));
}

return args;
Expand Down
Loading