Merge remote-tracking branch 'origin/master' into new-project-model

Conflicts:
	main/external/debugger-libs
	main/external/fsharpbinding
	main/external/mono-addins
	main/external/nrefactory
	main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring.CodeActions/MDRefactoringContext.cs
	main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger/BreakpointPropertiesDialog.cs
	main/src/addins/MonoDevelop.PackageManagement/MonoDevelop.PackageManagement/PackageUpdateChecker.cs
	main/src/addins/TextTemplating/MonoDevelop.TextTemplating/TextTemplatingFileGenerator.cs
	main/src/addins/TextTemplating/MonoDevelop.TextTemplating/TextTemplatingFilePreprocessor.cs
	main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.csproj
	main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlCommandHandler.cs
	main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl/VersionControlItem.cs
	main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProject.cs
	main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectHandler.cs
	main/src/core/MonoDevelop.Core/MonoDevelop.Projects.SharedAssetsProjects/SharedAssetsProjectMSBuildHandler.cs
	main/src/core/MonoDevelop.Core/MonoDevelop.Projects/DotNetCompilerParameters.cs
	main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/FindReplace.cs
	main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.FindInFiles/Scope.cs
	main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui/StatusProgressMonitor.cs
	main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ProgressMonitoring/BaseProgressMonitor.cs
	main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Tasks/UserTasksView.cs
	main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/IdeStartup.cs
	main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/RootWorkspace.cs
	main/tests/UnitTests/MonoDevelop.Projects/ProjectTests.cs

2 files changed, 3 insertions, 7 deletions

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ProgressMonitoring/BaseProgressMonitor.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ProgressMonitoring/BaseProgressMonitor.cs
index 348ce2aa23..4cb27be1f2 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ProgressMonitoring/BaseProgressMonitor.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ProgressMonitoring/BaseProgressMonitor.cs
@@ -43,11 +43,7 @@ namespace MonoDevelop.Ide.ProgressMonitoring
 		public static void ShowResultDialog (this ProgressMonitor monitor)
 		{
 			if (monitor.Errors.Length == 1 && !monitor.HasWarnings) {
-				var error = monitor.Errors [0];
-				if (error.Exception != null)
-					MessageService.ShowException (error.Exception, error.Message);
-				else
-					MessageService.ShowError (error.Message);
+				MessageService.ShowError (monitor.Errors [0], error.Exception);
 			}
 			else if (!monitor.HasErrors && monitor.Warnings.Length == 1) {
 				MessageService.ShowWarning (monitor.Warnings[0]);
diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ProgressMonitoring/MultiTaskDialogProgressMonitor.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ProgressMonitoring/MultiTaskDialogProgressMonitor.cs
index 8e24e95f31..aa37059952 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ProgressMonitoring/MultiTaskDialogProgressMonitor.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.ProgressMonitoring/MultiTaskDialogProgressMonitor.cs
@@ -179,14 +179,14 @@ namespace MonoDevelop.Ide.ProgressMonitoring
 				string s = "";
 				foreach (string m in errorsMessages)
 					s += m + "\n";
-				MessageService.ShowException (errorException, s);
+				MessageService.ShowError (s, errorException);
 			}
 			
 			if (warningMessages.Count > 0) {
 				string s = "";
 				foreach (string m in warningMessages)
 					s += m + "\n";
-				MessageService.ShowError (s);
+				MessageService.ShowWarning (s);
 			}
 		}
 	}