Merge remote-tracking branch 'origin/master' into roslyn-nogtkshell

3 files changed, 8 insertions, 18 deletions

diff --git a/main/src/addins/MonoDevelop.Autotools/MakefileData.cs b/main/src/addins/MonoDevelop.Autotools/MakefileData.cs
index 452b56c66e..a11cb8d733 100644
--- a/main/src/addins/MonoDevelop.Autotools/MakefileData.cs
+++ b/main/src/addins/MonoDevelop.Autotools/MakefileData.cs
@@ -39,7 +39,7 @@ using MonoDevelop.Projects;
 using MonoDevelop.Core.Assemblies;
 using MonoDevelop.Ide;
 using System.Xml;
-using MonoDevelop.Projects.Formats.MSBuild;
+using MonoDevelop.Projects.MSBuild;
 
 namespace MonoDevelop.Autotools
 {
diff --git a/main/src/addins/MonoDevelop.Autotools/MakefileProjectServiceExtension.cs b/main/src/addins/MonoDevelop.Autotools/MakefileProjectServiceExtension.cs
index d0575adc6e..7c39600a08 100644
--- a/main/src/addins/MonoDevelop.Autotools/MakefileProjectServiceExtension.cs
+++ b/main/src/addins/MonoDevelop.Autotools/MakefileProjectServiceExtension.cs
@@ -45,7 +45,7 @@ namespace MonoDevelop.Autotools
 {
 	public class MakefileProjectServiceExtension : SolutionExtension
 	{
-		protected override void OnReadSolution (ProgressMonitor monitor, MonoDevelop.Projects.Formats.MSBuild.SlnFile file)
+		protected override void OnReadSolution (ProgressMonitor monitor, MonoDevelop.Projects.MSBuild.SlnFile file)
 		{
 			base.OnReadSolution (monitor, file);
 
@@ -77,7 +77,7 @@ namespace MonoDevelop.Autotools
 			set { data = value; }
 		}
 
-		protected override void OnReadProject (ProgressMonitor monitor, MonoDevelop.Projects.Formats.MSBuild.MSBuildProject msproject)
+		protected override void OnReadProject (ProgressMonitor monitor, MonoDevelop.Projects.MSBuild.MSBuildProject msproject)
 		{
 			base.OnReadProject (monitor, msproject);
 			var ext = msproject.GetMonoDevelopProjectExtension ("MonoDevelop.Autotools.MakefileInfo");
@@ -102,7 +102,7 @@ namespace MonoDevelop.Autotools
 			}
 		}
 
-		protected override void OnWriteProject (ProgressMonitor monitor, MonoDevelop.Projects.Formats.MSBuild.MSBuildProject msproject)
+		protected override void OnWriteProject (ProgressMonitor monitor, MonoDevelop.Projects.MSBuild.MSBuildProject msproject)
 		{
 			base.OnWriteProject (monitor, msproject);
 
diff --git a/main/src/addins/MonoDevelop.Autotools/SimpleProjectMakefileHandler.cs b/main/src/addins/MonoDevelop.Autotools/SimpleProjectMakefileHandler.cs
index 30fbb7f176..74f91b4895 100644
--- a/main/src/addins/MonoDevelop.Autotools/SimpleProjectMakefileHandler.cs
+++ b/main/src/addins/MonoDevelop.Autotools/SimpleProjectMakefileHandler.cs
@@ -297,8 +297,10 @@ namespace MonoDevelop.Autotools
 					{
 						if (reference.ReferenceType != ReferenceType.Project)
 							continue;
-						Project refp = GetProjectFromName (reference.Reference, ctx.TargetSolution);
-
+						Project refp = reference.ResolveProject (ctx.TargetSolution);
+						if (refp == null) {
+							throw new Exception (GettextCatalog.GetString ("Couldn't find referenced project '{0}'", reference.Reference));
+						}
 						if (!(refp is DotNetProject))
 							continue;
 						
@@ -772,18 +774,6 @@ endif", s.SwitchName.Replace ('-', '_').ToUpperInvariant (), s.Define));
 			dict [extName] = filePath;
 			return extName;
 		}
-
-		Project GetProjectFromName (string name, Solution targetSolution)
-		{
-			Project refp = null;
-			if (targetSolution != null) refp = targetSolution.FindProjectByName (name);
-
-			if (refp == null)
-				throw new Exception ( GettextCatalog.GetString ("Couldn't find referenced project '{0}'", 
-							name ) );
-			
-			return refp;
-		}
 	}
 	
 	class DeployFileData