diff options
| -rw-r--r-- | main/msbuild/MDBuildTasks/FilterLocalCopyReferences.cs | 3 |
1 files changed, 2 insertions, 1 deletions
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;
|