[MSBuild] Test ToolsVersion is loaded/converted correctly

2 files changed, 18 insertions, 11 deletions

diff --git a/main/tests/UnitTests/MonoDevelop.Projects/MSBuildTests.cs b/main/tests/UnitTests/MonoDevelop.Projects/MSBuildTests.cs
index f0e5f0a0e7..e97ca99003 100644
--- a/main/tests/UnitTests/MonoDevelop.Projects/MSBuildTests.cs
+++ b/main/tests/UnitTests/MonoDevelop.Projects/MSBuildTests.cs
@@ -37,6 +37,7 @@ using MonoDevelop.Ide.Projects;
 using System.Linq;
 using Mono.CSharp;
 using MonoDevelop.Core.ProgressMonitoring;
+using MonoDevelop.Projects.Formats.MSBuild;
 
 namespace MonoDevelop.Projects
 {
@@ -377,7 +378,7 @@ namespace MonoDevelop.Projects
 			Assert.IsTrue (asms.Contains (testRef));
 		}
 
-		void LoadBuildVSConsoleProject (string vsVersion)
+		void LoadBuildVSConsoleProject (string vsVersion, string toolsVersion)
 		{
 			string solFile = Util.GetSampleProject ("ConsoleApp-VS" + vsVersion, "ConsoleApplication.sln");
 			var monitor = new NullProgressMonitor ();
@@ -385,6 +386,7 @@ namespace MonoDevelop.Projects
 			Assert.IsTrue (monitor.Errors.Length == 0);
 			Assert.IsTrue (monitor.Warnings.Length == 0);
 			var p = (DotNetProject) sol.GetAllProjects ().First ();
+			Assert.AreEqual (toolsVersion, MSBuildProjectService.GetHandler (p).ToolsVersion);
 			var r = sol.Build (monitor, "Debug");
 			Assert.IsTrue (monitor.Errors.Length == 0);
 			Assert.IsTrue (monitor.Warnings.Length == 0);
@@ -404,20 +406,20 @@ namespace MonoDevelop.Projects
 		[Test]
 		public void LoadBuildVS2010ConsoleProject ()
 		{
-			LoadBuildVSConsoleProject ("2010");
+			LoadBuildVSConsoleProject ("2010", "4.0");
 		}
 
 		[Test]
 		public void LoadBuildVS2012ConsoleProject ()
 		{
-			LoadBuildVSConsoleProject ("2012");
+			LoadBuildVSConsoleProject ("2012", "4.0");
 		}
 
 		[Ignore ("ToolsVersion 12.0 does not yet work w/ xbuild")]
 		[Test]
 		public void LoadBuildVS2013ConsoleProject ()
 		{
-			LoadBuildVSConsoleProject ("2013");
+			LoadBuildVSConsoleProject ("2013", "12.0");
 		}
 	}
 }
diff --git a/main/tests/UnitTests/MonoDevelop.Projects/SolutionTests.cs b/main/tests/UnitTests/MonoDevelop.Projects/SolutionTests.cs
index 0235665ca1..db13dc905b 100644
--- a/main/tests/UnitTests/MonoDevelop.Projects/SolutionTests.cs
+++ b/main/tests/UnitTests/MonoDevelop.Projects/SolutionTests.cs
@@ -31,6 +31,7 @@ using System.Collections.Generic;
 using NUnit.Framework;
 using UnitTests;
 using MonoDevelop.Core;
+using MonoDevelop.Projects.Formats.MSBuild;
 
 namespace MonoDevelop.Projects
 {
@@ -511,19 +512,22 @@ namespace MonoDevelop.Projects
 			
 			Assert.AreEqual (Services.ProjectService.DefaultFileFormat.Id, sol.FileFormat.Id);
 			Assert.AreEqual (Services.ProjectService.DefaultFileFormat.Id, p.FileFormat.Id);
+			Assert.AreEqual ("4.0", MSBuildProjectService.GetHandler (p).ToolsVersion);
 			
 			// Change solution format of unsaved solution
 			
 			sol.ConvertToFormat (Util.FileFormatMSBuild10, true);
 			
-			Assert.AreEqual ("MSBuild10", sol.FileFormat.Id);
-			Assert.AreEqual ("MSBuild10", p.FileFormat.Id);
-			
+			Assert.AreEqual ("MSBuild08", sol.FileFormat.Id);
+			Assert.AreEqual ("MSBuild08", p.FileFormat.Id);
+			Assert.AreEqual ("3.5", MSBuildProjectService.GetHandler (p).ToolsVersion);
+
 			sol.ConvertToFormat (Util.FileFormatMSBuild12, true);
 			
-			Assert.AreEqual ("MSBuild12", sol.FileFormat.Id);
-			Assert.AreEqual ("MSBuild12", p.FileFormat.Id);
-			
+			Assert.AreEqual ("MSBuild10", sol.FileFormat.Id);
+			Assert.AreEqual ("MSBuild10", p.FileFormat.Id);
+			Assert.AreEqual ("4.0", MSBuildProjectService.GetHandler (p).ToolsVersion);
+
 			// Change solution format of saved solution
 			
 			sol.Save (Util.GetMonitor ());
@@ -532,7 +536,8 @@ namespace MonoDevelop.Projects
 			
 			Assert.AreEqual ("MSBuild05", sol.FileFormat.Id);
 			Assert.AreEqual ("MSBuild05", p.FileFormat.Id);
-			
+			Assert.AreEqual ("2.0", MSBuildProjectService.GetHandler (p).ToolsVersion);
+
 			// Add new project
 			
 			Project newp = new DotNetAssemblyProject ("C#");