Fixes spacing issues in MSBuild tasks (#5338)
This commit is contained in:
Родитель
0772f6a9c6
Коммит
7e41ef7d3e
|
@ -10,7 +10,7 @@ namespace Xamarin.MacDev.Tasks
|
|||
{
|
||||
public abstract class UnpackLibraryResourcesTaskBase : Task
|
||||
{
|
||||
List<ITaskItem> unpackedResources = new List<ITaskItem>();
|
||||
List<ITaskItem> unpackedResources = new List<ITaskItem> ();
|
||||
|
||||
#region Inputs
|
||||
|
||||
|
@ -83,7 +83,7 @@ namespace Xamarin.MacDev.Tasks
|
|||
}
|
||||
|
||||
BundleResourcesWithLogicalNames = results.ToArray ();
|
||||
UnpackedResources = unpackedResources.ToArray();
|
||||
UnpackedResources = unpackedResources.ToArray ();
|
||||
|
||||
return !Log.HasLoggedErrors;
|
||||
}
|
||||
|
@ -123,9 +123,9 @@ namespace Xamarin.MacDev.Tasks
|
|||
var path = Path.Combine (intermediatePath, rpath);
|
||||
var file = new FileInfo (path);
|
||||
|
||||
var item = new TaskItem(path);
|
||||
item.SetMetadata("LogicalName", rpath);
|
||||
item.SetMetadata("Optimize", "false");
|
||||
var item = new TaskItem (path);
|
||||
item.SetMetadata ("LogicalName", rpath);
|
||||
item.SetMetadata ("Optimize", "false");
|
||||
|
||||
if (file.Exists && file.LastWriteTimeUtc >= asmWriteTime) {
|
||||
Log.LogMessage (" Up to date: {0}", rpath);
|
||||
|
@ -139,7 +139,7 @@ namespace Xamarin.MacDev.Tasks
|
|||
resource.CopyTo (stream);
|
||||
}
|
||||
|
||||
unpackedResources.Add(item);
|
||||
unpackedResources.Add (item);
|
||||
}
|
||||
|
||||
yield return item;
|
||||
|
|
|
@ -684,30 +684,28 @@ namespace Xamarin.iOS.Tasks
|
|||
|
||||
Directory.CreateDirectory (AppBundleDir);
|
||||
|
||||
var result = base.Execute();
|
||||
var result = base.Execute ();
|
||||
|
||||
CopiedFrameworks = GetCopiedFrameworks();
|
||||
CopiedFrameworks = GetCopiedFrameworks ();
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
ITaskItem[] GetCopiedFrameworks()
|
||||
ITaskItem[] GetCopiedFrameworks ()
|
||||
{
|
||||
var copiedFrameworks = new List<ITaskItem>();
|
||||
var frameworksDir = Path.Combine(AppBundleDir, "Frameworks");
|
||||
var copiedFrameworks = new List<ITaskItem> ();
|
||||
var frameworksDir = Path.Combine (AppBundleDir, "Frameworks");
|
||||
|
||||
if (Directory.Exists(frameworksDir))
|
||||
{
|
||||
foreach (var dir in Directory.EnumerateDirectories(frameworksDir, "*.framework"))
|
||||
{
|
||||
var framework = Path.Combine(dir, Path.GetFileNameWithoutExtension(dir));
|
||||
if (Directory.Exists (frameworksDir)) {
|
||||
foreach (var dir in Directory.EnumerateDirectories (frameworksDir, "*.framework")) {
|
||||
var framework = Path.Combine (dir, Path.GetFileNameWithoutExtension (dir));
|
||||
|
||||
if (File.Exists(framework))
|
||||
copiedFrameworks.Add(new TaskItem(framework));
|
||||
if (File.Exists (framework))
|
||||
copiedFrameworks.Add (new TaskItem (framework));
|
||||
}
|
||||
}
|
||||
|
||||
return copiedFrameworks.ToArray();
|
||||
return copiedFrameworks.ToArray ();
|
||||
}
|
||||
|
||||
string ResolveFrameworkFile (string fullName)
|
||||
|
|
Загрузка…
Ссылка в новой задаче