Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
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>$(MSBuildProjectDirectory)/$(IntermediateOutputPath)xcode/</_XcodeProjectDefaultOutputPathRoot>
<_XcodeProjectDefaultOutputPathRoot>$(IntermediateOutputPath)xcode/</_XcodeProjectDefaultOutputPathRoot>
<_BuildXcodeProjectsStamp>$(_MaciOSStampDirectory)_BuildXcodeProjects.stamp</_BuildXcodeProjectsStamp>
</PropertyGroup>

Expand Down
6 changes: 3 additions & 3 deletions msbuild/Xamarin.MacDev.Tasks/Tasks/CreateXcArchive.cs
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
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