Revert "Revert "Revert "MSBuild support fixes"""

This reverts commit 6e1037d71191077ff5ef920107d81258d4abb4d3.

3 files changed, 1 insertions, 31 deletions

diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/BuildEngine.cs b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/BuildEngine.cs
index 6644ad3f79..315bd88b46 100644
--- a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/BuildEngine.cs
+++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/BuildEngine.cs
@@ -46,7 +46,6 @@ namespace MonoDevelop.Projects.Formats.MSBuild
 
 		ManualResetEvent doneEvent = new ManualResetEvent (false);
 		Dictionary<string,Engine> engines = new Dictionary<string, Engine> ();
-		Dictionary<string,string> unsavedProjects = new Dictionary<string, string> ();
 
 		public void Dispose ()
 		{
@@ -93,9 +92,6 @@ namespace MonoDevelop.Projects.Formats.MSBuild
 
 		internal void UnloadProject (string file)
 		{
-			lock (unsavedProjects)
-				unsavedProjects.Remove (file);
-
 			RunSTA (delegate {
 				foreach (var engine in engines.Values) {
 					var loadedProj = engine.GetLoadedProject (file);
@@ -105,21 +101,6 @@ namespace MonoDevelop.Projects.Formats.MSBuild
 			});
 		}
 
-		internal void SetUnsavedProjectContent (string file, string content)
-		{
-			lock (unsavedProjects)
-				unsavedProjects [file] = content;
-		}
-
-		internal string GetUnsavedProjectContent (string file)
-		{
-			lock (unsavedProjects) {
-				string content;
-				unsavedProjects.TryGetValue (file, out content);
-				return content;
-			}
-		}
-
 		internal static void RunSTA (ThreadStart ts)
 		{
 			lock (workLock) {
diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/IProjectBuilder.cs b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/IProjectBuilder.cs
index 8253c49b33..167acc7240 100644
--- a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/IProjectBuilder.cs
+++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/IProjectBuilder.cs
@@ -34,7 +34,6 @@ namespace MonoDevelop.Projects.Formats.MSBuild
 			MSBuildVerbosity verbosity);
 		string[] GetAssemblyReferences (ProjectConfigurationInfo[] configurations);
 		void Refresh ();
-		void RefreshWithContent (string projectContent);
 	}
 
 	[Serializable]
diff --git a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/ProjectBuilder.cs b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/ProjectBuilder.cs
index 56960f921d..20a59ab9e4 100644
--- a/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/ProjectBuilder.cs
+++ b/main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/ProjectBuilder.cs
@@ -63,12 +63,6 @@ namespace MonoDevelop.Projects.Formats.MSBuild
 			buildEngine.UnloadProject (file);
 		}
 		
-		public void RefreshWithContent (string projectContent)
-		{
-			buildEngine.UnloadProject (file);
-			buildEngine.SetUnsavedProjectContent (file, projectContent);
-		}
-
 		void LogWriteLine (string txt)
 		{
 			if (currentLogWriter != null)
@@ -151,11 +145,7 @@ namespace MonoDevelop.Projects.Formats.MSBuild
 				var p = engine.GetLoadedProject (pc.ProjectFile);
 				if (p == null) {
 					p = new Project (engine);
-					var content = buildEngine.GetUnsavedProjectContent (pc.ProjectFile);
-					if (content == null)
-						p.Load (pc.ProjectFile);
-					else
-						p.Load (new StringReader (content));
+					p.Load (pc.ProjectFile);
 				}
 				p.GlobalProperties.SetProperty ("Configuration", pc.Configuration);
 				if (!string.IsNullOrEmpty (pc.Platform))