From e536ff658d280dc9e226a1a4c707e8f6382ca35c Mon Sep 17 00:00:00 2001
From: Sandy Armstrong <sandy@xamarin.com>
Date: Wed, 30 Jan 2019 09:01:53 -0800
Subject: FilterLocalCopyReferences: Fix including
 AndroidDeviceManager.Resources.dll

---
 main/msbuild/MDBuildTasks/FilterLocalCopyReferences.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'main/msbuild')

diff --git a/main/msbuild/MDBuildTasks/FilterLocalCopyReferences.cs b/main/msbuild/MDBuildTasks/FilterLocalCopyReferences.cs
index 14acbc4f1c..43f4557d4a 100644
--- a/main/msbuild/MDBuildTasks/FilterLocalCopyReferences.cs
+++ b/main/msbuild/MDBuildTasks/FilterLocalCopyReferences.cs
@@ -102,7 +102,8 @@ namespace MDBuildTasks
 				var includeKey = filename;
 				switch (Path.GetExtension (includeKey).ToLowerInvariant ()) {
 				case ".dll":
-					if (includeKey.EndsWith (".resources.dll", StringComparison.OrdinalIgnoreCase)) {
+					// Only make this change if the user hasn't explicitly put a *.resources.dll file in the include list (e.g. AndroidDeviceManager.Resources.dll should be treated like a normal DLL)
+					if (!includeKeyHash.Contains(includeKey) && includeKey.EndsWith (".resources.dll", StringComparison.OrdinalIgnoreCase)) {
 						includeKey = includeKey.Substring (0, includeKey.Length - ".resources.dll".Length) + ".dll";
 					}
 					break;
-- 
cgit v1.2.3