From 67bdff568b2f507c932ba857bb76ca8b3522cc6f Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Mon, 15 Aug 2016 15:07:34 -0400 Subject: [PATCH] [msbuild] code cleanup (#607) --- .../Tasks/CollectFrameworksBase.cs | 7 ++----- msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.Common.targets | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/msbuild/Xamarin.MacDev.Tasks.Core/Tasks/CollectFrameworksBase.cs b/msbuild/Xamarin.MacDev.Tasks.Core/Tasks/CollectFrameworksBase.cs index 8c47b7f344..65627d2f7c 100644 --- a/msbuild/Xamarin.MacDev.Tasks.Core/Tasks/CollectFrameworksBase.cs +++ b/msbuild/Xamarin.MacDev.Tasks.Core/Tasks/CollectFrameworksBase.cs @@ -1,12 +1,9 @@ -using System; -using System.IO; -using System.Linq; +using System.IO; using System.Collections.Generic; using Microsoft.Build.Framework; using Microsoft.Build.Utilities; -using Xamarin.MacDev; using Xamarin.MacDev.Tasks; namespace Xamarin.iOS.Tasks @@ -39,7 +36,7 @@ namespace Xamarin.iOS.Tasks var fwDir = Path.Combine (AppBundlePath, "Frameworks"); if (Directory.Exists (fwDir)) { foreach (var fw in Directory.GetDirectories (fwDir)) { - if (!fw.EndsWith (".framework")) { + if (Path.GetExtension (fw) != ".framework") { Log.LogWarning ("Found a directory within the Frameworks directory which is not a framework: {0}", fw); continue; } diff --git a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.Common.targets b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.Common.targets index 297238bd5d..b55b284916 100644 --- a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.Common.targets +++ b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.Common.targets @@ -758,7 +758,7 @@ Copyright (C) 2013-2016 Xamarin. All rights reserved. ToolPath="$(DSymUtilPath)"> - +