diff options
| author | Sandy Armstrong <sandy@xamarin.com> | 2019-01-30 20:01:53 +0300 |
|---|---|---|
| committer | Sandy Armstrong <sandy@xamarin.com> | 2019-01-30 20:01:53 +0300 |
| commit | e536ff658d280dc9e226a1a4c707e8f6382ca35c (patch) | |
| tree | c90df7ee111f126b4f024d7aea1dd84c0fa83758 /main/msbuild | |
| parent | 261381c233b10b30a955c9ef6e6a1bf1f8a38910 (diff) | |
FilterLocalCopyReferences: Fix including AndroidDeviceManager.Resources.dll
Diffstat (limited to 'main/msbuild')
| -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;
|