Skip to content

[msbuild] Ignore .DS_Store files when cloning asset catalogs #1776

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
VincentDondain merged 2 commits into from
Feb 27, 2017
Merged

[msbuild] Ignore .DS_Store files when cloning asset catalogs #1776

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fb68c8f
[msbuild] Ignore .DS_Store files when cloning asset catalogs
jstedfast Feb 27, 2017
9c37444
Reorder some operations to avoid unnecessary work in failure case
jstedfast Feb 27, 2017
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
24 changes: 20 additions & 4 deletions msbuild/Xamarin.MacDev.Tasks.Core/Tasks/ACToolTaskBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,10 @@ public override bool Execute ()
for (int i = 0; i < ImageAssets.Length; i++) {
var vpath = BundleResource.GetVirtualProjectPath (ProjectDir, ImageAssets[i], !string.IsNullOrEmpty (SessionId));

// Ignore MacOS .DS_Store files...
if (Path.GetFileName (vpath).Equals (".DS_Store", StringComparison.OrdinalIgnoreCase))
continue;

// get the parent (which will typically be .appiconset, .launchimage, .imageset, .iconset, etc)
var catalog = Path.GetDirectoryName (vpath);

Expand Down Expand Up @@ -336,6 +340,10 @@ public override bool Execute ()
var clone = false;
ITaskItem item;

// Ignore MacOS .DS_Store files...
if (Path.GetFileName (vpath).Equals (".DS_Store", StringComparison.OrdinalIgnoreCase))
continue;

foreach (var catalog in clones) {
if (vpath.Length > catalog.Length && vpath[catalog.Length] == '/' && vpath.StartsWith (catalog, StringComparison.Ordinal)) {
clone = true;
Expand All @@ -344,17 +352,25 @@ public override bool Execute ()
}

if (clone) {
var path = Path.Combine (intermediateCloneDir, vpath);
var dir = Path.GetDirectoryName (path);
var src = ImageAssets[i].GetMetadata ("FullPath");

if (!File.Exists (src)) {
Log.LogError (null, null, null, src, 0, 0, 0, 0, "File not found: {0}", src);
return false;
}

var dest = Path.Combine (intermediateCloneDir, vpath);
var dir = Path.GetDirectoryName (dest);

Directory.CreateDirectory (dir);
File.Copy (ImageAssets[i].GetMetadata ("FullPath"), path, true);

File.Copy (src, dest, true);

// filter out everything except paths containing a Contents.json file since our main processing loop only cares about these
if (Path.GetFileName (vpath) != "Contents.json")
continue;

item = new TaskItem (path);
item = new TaskItem (dest);
ImageAssets[i].CopyMetadataTo (item);
item.SetMetadata ("Link", vpath);
} else {
Expand Down