From 32df9a2b43846506b1fed896529bbc736aee89bd Mon Sep 17 00:00:00 2001 From: mterwoord_cp <7cd3fd84a0151ea055c2f79e4d2eef9576fe9afesxUZAwxD> Date: Sun, 5 Dec 2010 17:53:26 +0000 Subject: [PATCH] --- .../MPF/10.0/Src/CSharp/AssemblyReferenceNode.cs | 14 ++++++-------- .../CSharp/Automation/VSProject/OAVSProjectItem.cs | 2 +- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/source2/VSIP/MPF/10.0/Src/CSharp/AssemblyReferenceNode.cs b/source2/VSIP/MPF/10.0/Src/CSharp/AssemblyReferenceNode.cs index f68615002..e381b33a2 100644 --- a/source2/VSIP/MPF/10.0/Src/CSharp/AssemblyReferenceNode.cs +++ b/source2/VSIP/MPF/10.0/Src/CSharp/AssemblyReferenceNode.cs @@ -348,7 +348,7 @@ namespace Microsoft.VisualStudio.Project // Get the list of items which require HintPath ICollection references = this.ProjectMgr.CurrentConfig.GetItems(MsBuildGeneratedItemType.ReferenceCopyLocalPaths); - + // Remove the HintPath, we will re-add it below if it is needed if(!String.IsNullOrEmpty(this.assemblyPath)) { @@ -401,13 +401,11 @@ namespace Microsoft.VisualStudio.Project } // Check if we have to resolve again the path to the assembly. - if(string.IsNullOrEmpty(this.assemblyPath)) - { - ResolveReference(); - } - - // Make sure that the hint path if set (if needed). - SetHintPathAndPrivateValue(); + if (string.IsNullOrEmpty(this.assemblyPath)) + { + ResolveReference(); + SetHintPathAndPrivateValue(); + } } /// diff --git a/source2/VSIP/MPF/10.0/Src/CSharp/Automation/VSProject/OAVSProjectItem.cs b/source2/VSIP/MPF/10.0/Src/CSharp/Automation/VSProject/OAVSProjectItem.cs index 890762b6f..36145afdc 100644 --- a/source2/VSIP/MPF/10.0/Src/CSharp/Automation/VSProject/OAVSProjectItem.cs +++ b/source2/VSIP/MPF/10.0/Src/CSharp/Automation/VSProject/OAVSProjectItem.cs @@ -12,8 +12,8 @@ PURPOSE, MERCHANTABILITY, OR NON-INFRINGEMENT. using System; using System.Diagnostics.CodeAnalysis; using System.Runtime.InteropServices; -using VSLangProj; using EnvDTE; +using VSLangProj; namespace Microsoft.VisualStudio.Project.Automation {