From ae047281a314b2387cf8e75f53d629e2ff17bbeb Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Tue, 28 Feb 2017 13:34:32 -0500 Subject: [PATCH] [msbuild] Index into the correct item array when printing an error message (#1792) Fixes https://bugzilla.xamarin.com/show_bug.cgi?id=52860 When the ImageAssets contain an item that doesn't live within a *.xcassets directory, index into ImageAssets[] rather than items[] which hasn't been populated yet. Also fixed the tagsList for-loop to use tagsList.Count instead for correctness (even though tags.Count and tagsList.Count should always be identical). --- msbuild/Xamarin.MacDev.Tasks.Core/Tasks/ACToolTaskBase.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/msbuild/Xamarin.MacDev.Tasks.Core/Tasks/ACToolTaskBase.cs b/msbuild/Xamarin.MacDev.Tasks.Core/Tasks/ACToolTaskBase.cs index c0eb70a0fb..1102b0c295 100644 --- a/msbuild/Xamarin.MacDev.Tasks.Core/Tasks/ACToolTaskBase.cs +++ b/msbuild/Xamarin.MacDev.Tasks.Core/Tasks/ACToolTaskBase.cs @@ -305,7 +305,7 @@ namespace Xamarin.MacDev.Tasks catalog = Path.GetDirectoryName (catalog); if (string.IsNullOrEmpty (catalog)) { - Log.LogWarning (null, null, null, items[i].ItemSpec, 0, 0, 0, 0, "Asset not part of an asset catalog: {0}", items[i].ItemSpec); + Log.LogWarning (null, null, null, ImageAssets[i].ItemSpec, 0, 0, 0, 0, "Asset not part of an asset catalog: {0}", ImageAssets[i].ItemSpec); continue; } @@ -430,7 +430,7 @@ namespace Xamarin.MacDev.Tasks Directory.CreateDirectory (assetDir); - for (int j = 0; j < tags.Count; j++) + for (int j = 0; j < tagList.Count; j++) ptags.Add (new PString (tagList[j])); assetpack.Add ("bundle-id", new PString (string.Format ("{0}.asset-pack-{1}", bundleIdentifier, hash)));