[mono/monodevelop] [2 commits] 2f80b29f: [Core] Set Solution* MSbuild properties

"Michael Hutchinson ([email protected])" <[email protected]> Fri, 8 Nov 2013 07:10:12 +0000
Newsgroups gmane.comp.gnome.mono.patches
Message-ID <00000142368bfa7a-e0390890-659a-4bc4-8e91-e5213dfdb4b9-000000@email.amazonses.com>
   Branch: refs/heads/master
     Home: https://github.com/mono/monodevelop
  Compare: https://github.com/mono/monodevelop/compare/d30dbc9159b8...8dcd672f7c92

   Commit: 2f80b29fcad590801fc9d33a6419b3bbccbb4f05
   Author: Michael Hutchinson <[email protected]> (mhutch)
     Date: 2013-11-08 07:05:29 GMT
      URL: https://github.com/mono/monodevelop/commit/2f80b29fcad590801fc9d33a6419b3bbccbb4f05

[Core] Set Solution* MSbuild properties

BXC15964 - All $(Solution) Macros for build events are undefined

Changed paths:
  M main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectHandler.cs
  M main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectService.cs
  M main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/RemoteProjectBuilder.cs
  M main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/BuildEngine.cs
  M main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/BuildEngine.v4.0.cs
  M main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/IBuildEngine.cs
  M main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/ProjectBuilder.cs
  M main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/ProjectBuilder.v4.0.cs

Modified: main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectHandler.cs
===================================================================
@@ -37,11 +37,9 @@
 using MonoDevelop.Core.Assemblies;
 using MonoDevelop.Projects.Formats.MD1;
 using MonoDevelop.Projects.Extensions;
-using MonoDevelop.Core.Execution;
 using Mono.Addins;
 using System.Linq;
 using MonoDevelop.Core.Instrumentation;
-using System.Text;
 using MonoDevelop.Core.ProgressMonitoring;
 
 namespace MonoDevelop.Projects.Formats.MSBuild
@@ -134,7 +132,9 @@ RemoteProjectBuilder GetProjectBuilder ()
 					projectBuilder.Dispose ();
 					projectBuilder = null;
 				}
-				projectBuilder = MSBuildProjectService.GetProjectBuilder (runtime, toolsVersion, item.FileName);
+				var sln = item.ParentSolution;
+				var slnFile = sln != null ? sln.FileName : null;
+				projectBuilder = MSBuildProjectService.GetProjectBuilder (runtime, toolsVersion, item.FileName, slnFile);
 				lastBuildToolsVersion = toolsVersion;
 				lastBuildRuntime = runtime.Id;
 				lastFileName = item.FileName;
@@ -220,7 +220,6 @@ public override BuildResult RunTarget (IProgressMonitor monitor, string target,
 			if (UseMSBuildEngineForItem (Item, configuration)) {
 				SolutionEntityItem item = Item as SolutionEntityItem;
 				if (item != null) {
-					
 					LogWriter logWriter = new LogWriter (monitor.Log);
 					RemoteProjectBuilder builder = GetProjectBuilder ();
 					var configs = GetConfigurations (item, configuration);

Modified: main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/MSBuildProjectService.cs
===================================================================
@@ -476,7 +476,7 @@ public static bool TrySplitResourceName (string fname, out string only_filename,
 			return true;
 		}
 		
-		public static RemoteProjectBuilder GetProjectBuilder (TargetRuntime runtime, string toolsVersion, string file)
+		public static RemoteProjectBuilder GetProjectBuilder (TargetRuntime runtime, string toolsVersion, string file, string solutionFile)
 		{
 			lock (builders) {
 				var toolsFx = Runtime.SystemAssemblyService.GetTargetFramework (new TargetFrameworkMoniker (toolsVersion));
@@ -491,7 +491,7 @@ public static RemoteProjectBuilder GetProjectBuilder (TargetRuntime runtime, str
 				RemoteBuildEngine builder;
 				if (builders.TryGetValue (builderKey, out builder)) {
 					builder.ReferenceCount++;
-					return new RemoteProjectBuilder (file, binDir, builder);
+					return new RemoteProjectBuilder (file, solutionFile, binDir, builder);
 				}
 
 				//always start the remote process explicitly, even if it's using the current runtime and fx
@@ -526,7 +526,7 @@ public static RemoteProjectBuilder GetProjectBuilder (TargetRuntime runtime, str
 				
 				builders [builderKey] = builder;
 				builder.ReferenceCount = 1;
-				return new RemoteProjectBuilder (file, binDir, builder);
+				return new RemoteProjectBuilder (file, solutionFile, binDir, builder);
 			}
 		}
 		

Modified: main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Formats.MSBuild/RemoteProjectBuilder.cs
===================================================================
@@ -43,9 +43,9 @@ public RemoteBuildEngine (Process proc, IBuildEngine engine)
 			this.engine = engine;
 		}
 
-		public IProjectBuilder LoadProject (string file, string binPath)
+		public IProjectBuilder LoadProject (string file, string solutionFile, string binPath)
 		{
-			return engine.LoadProject (file, binPath);
+			return engine.LoadProject (file, solutionFile, binPath);
 		}
 		
 		public void UnloadProject (IProjectBuilder pb)
@@ -71,10 +71,10 @@ public class RemoteProjectBuilder: IDisposable
 		RemoteBuildEngine engine;
 		IProjectBuilder builder;
 		
-		internal RemoteProjectBuilder (string file, string binPath, RemoteBuildEngine engine)
+		internal RemoteProjectBuilder (string file, string solutionFile, string binPath, RemoteBuildEngine engine)
 		{
 			this.engine = engine;
-			builder = engine.LoadProject (file, binPath);
+			builder = engine.LoadProject (file, solutionFile, binPath);
 		}
 		
 		public MSBuildResult[] RunTarget (string target, ProjectConfigurationInfo[] configurations, ILogWriter logWriter,

Modified: main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/BuildEngine.cs
===================================================================
@@ -57,9 +57,9 @@ public void Dispose ()
 			get { return doneEvent; }
 		}
 
-		public IProjectBuilder LoadProject (string file, string binDir)
+		public IProjectBuilder LoadProject (string file, string solutionFile, string binDir)
 		{
-			return new ProjectBuilder (this, GetEngine (binDir), file);
+			return new ProjectBuilder (this, GetEngine (binDir), file, solutionFile);
 		}
 		
 		public void UnloadProject (IProjectBuilder pb)

Modified: main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/BuildEngine.v4.0.cs
===================================================================
@@ -59,9 +59,9 @@ public void Dispose ()
 			get { return doneEvent; }
 		}
 
-		public IProjectBuilder LoadProject (string file, string binDir)
+		public IProjectBuilder LoadProject (string file, string solutionFile, string binDir)
 		{
-			return new ProjectBuilder (this, GetEngine (binDir), file);
+			return new ProjectBuilder (this, GetEngine (binDir), file, solutionFile);
 		}
 		
 		public void UnloadProject (IProjectBuilder pb)


Modified: main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/IBuildEngine.cs
===================================================================
@@ -30,7 +30,7 @@ namespace MonoDevelop.Projects.Formats.MSBuild
 {
 	public interface IBuildEngine: IDisposable
 	{
-		IProjectBuilder LoadProject (string file, string binPath);
+		IProjectBuilder LoadProject (string file, string solutionFile, string binPath);
 		void UnloadProject (IProjectBuilder pb);
 	}
 }

Modified: main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/ProjectBuilder.cs
===================================================================
@@ -25,10 +25,7 @@
 // THE SOFTWARE.
 
 using System;
-using System.Threading;
 using System.IO;
-using System.Runtime.Serialization.Formatters.Binary;
-using System.Runtime.Remoting;
 using Microsoft.Build.BuildEngine;
 using Microsoft.Build.Framework;
 using System.Collections.Generic;
@@ -41,13 +38,15 @@ public class ProjectBuilder: MarshalByRefObject, IProjectBuilder
 	{
 		Engine engine;
 		string file;
+		string solutionFile;
 		ILogWriter currentLogWriter;
 		MDConsoleLogger consoleLogger;
 		BuildEngine buildEngine;
 
-		public ProjectBuilder (BuildEngine buildEngine, Engine engine, string file)
+		public ProjectBuilder (BuildEngine buildEngine, Engine engine, string file, string solutionFile)
 		{
 			this.file = file;
+			this.solutionFile = solutionFile;
 			this.engine = engine;
 			this.buildEngine = buildEngine;
 			consoleLogger = new MDConsoleLogger (LoggerVerbosity.Normal, LogWriteLine, null, null);
@@ -167,6 +166,12 @@ Project SetupProject (ProjectConfigurationInfo[] configurations)
 						}
 					}
 				}
+				if (!string.IsNullOrEmpty (solutionFile)) {
+					p.GlobalProperties.SetProperty ("SolutionPath", Path.GetFullPath (solutionFile));
+					p.GlobalProperties.SetProperty ("SolutionName", Path.GetFileNameWithoutExtension (solutionFile));
+					p.GlobalProperties.SetProperty ("SolutionFilename", Path.GetFileName (solutionFile));
+					p.GlobalProperties.SetProperty ("SolutionDir", Path.GetDirectoryName (solutionFile) + Path.DirectorySeparatorChar);
+				};
 				p.GlobalProperties.SetProperty ("Configuration", pc.Configuration);
 				if (!string.IsNullOrEmpty (pc.Platform))
 					p.GlobalProperties.SetProperty ("Platform", pc.Platform);

Modified: main/src/core/MonoDevelop.Projects.Formats.MSBuild/MonoDevelop.Projects.Formats.MSBuild/ProjectBuilder.v4.0.cs
===================================================================
@@ -25,14 +25,10 @@
 // THE SOFTWARE.
 
 using System;
-using System.Threading;
 using System.IO;
-using System.Runtime.Serialization.Formatters.Binary;
-using System.Runtime.Remoting;
 using Microsoft.Build.Evaluation;
 using Microsoft.Build.Framework;
 using System.Collections.Generic;
-using System.Collections;
 using System.Linq;
 using Microsoft.Build.Logging;
 using Microsoft.Build.Execution;
@@ -44,13 +40,15 @@ public class ProjectBuilder: MarshalByRefObject, IProjectBuilder
 	{
 		ProjectCollection engine;
 		string file;
+		string solutionFile;
 		ILogWriter currentLogWriter;
 		ConsoleLogger consoleLogger;
 		BuildEngine buildEngine;
 
-		public ProjectBuilder (BuildEngine buildEngine, ProjectCollection engine, string file)
+		public ProjectBuilder (BuildEngine buildEngine, ProjectCollection engine, string file, string solutionFile)
 		{
 			this.file = file;
+			this.solutionFile = solutionFile;
 			this.engine = engine;
 			this.buildEngine = buildEngine;
 			consoleLogger = new ConsoleLogger (LoggerVerbosity.Normal, LogWriteLine, null, null);
@@ -170,6 +168,12 @@ Project ConfigureProject (string file, string configuration, string platform)
 					p = engine.LoadProject (new XmlTextReader (new StringReader (content)));
 					p.FullPath = file;
 				}
+				if (!string.IsNullOrEmpty (solutionFile)) {
+					p.SetProperty ("SolutionPath", Path.GetFullPath (solutionFile));
+					p.SetProperty ("SolutionName", Path.GetFileNameWithoutExtension (solutionFile));
+					p.SetProperty ("SolutionFilename", Path.GetFileName (solutionFile));
+					p.SetProperty ("SolutionDir", Path.GetDirectoryName (solutionFile) + Path.DirectorySeparatorChar);
+				};
 			}
 			p.SetProperty ("Configuration", configuration);
 			if (!string.IsNullOrEmpty (platform))


   Commit: 8dcd672f7c92a2f4bb649ce570054277a086a2f3
   Author: Michael Hutchinson <[email protected]> (mhutch)
     Date: 2013-11-08 07:05:43 GMT
      URL: https://github.com/mono/monodevelop/commit/8dcd672f7c92a2f4bb649ce570054277a086a2f3

Merge branch 'master' of github.com:mono/monodevelop

Changed paths:
  M extras/AspNetEdit/AspNetEdit.addin.xml
  M extras/AspNetEdit/configure
  M extras/BooBinding/BooBinding.addin.xml
  M extras/BooBinding/configure
  M extras/GeckoWebBrowser/MonoDevelop.WebBrowsers.GeckoWebBrowser.addin.xml
  M extras/GeckoWebBrowser/configure
  M extras/GtkSourceViewEditor/MonoDevelop.SourceEditor.addin.xml
  M extras/JavaBinding/JavaBinding.addin.xml
  M extras/JavaBinding/configure
  M extras/LuaBinding/LuaBinding.addin.xml
  M extras/MonoDevelop.AddinAuthoring/MonoDevelop.AddinAuthoring.addin.xml
  M extras/MonoDevelop.AddinAuthoring/configure
  M extras/MonoDevelop.CodeAnalysis/MonoDevelop.CodeAnalysis.Gendarme/MonoDevelop.CodeAnalysis.Gendarme.addin.xml
  M extras/MonoDevelop.CodeAnalysis/MonoDevelop.CodeAnalysis.Smokey/MonoDevelop.CodeAnalysis.Smokey.addin.xml
  M extras/MonoDevelop.CodeAnalysis/MonoDevelop.CodeAnalysis/MonoDevelop.CodeAnalysis.addin.xml
  M extras/MonoDevelop.Database/MonoDevelop.Database.CodeGenerator/MonoDevelop.Database.CodeGenerator.addin.xml
  M extras/MonoDevelop.Database/MonoDevelop.Database.Components/MonoDevelop.Database.Components.addin.xml
  M extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/MonoDevelop.Database.ConnectionManager.addin.xml
  M extras/MonoDevelop.Database/MonoDevelop.Database.Designer/MonoDevelop.Database.Designer.addin.xml
  M extras/MonoDevelop.Database/MonoDevelop.Database.Query/MonoDevelop.Database.Query.addin.xml
  M extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Firebird/MonoDevelop.Database.Sql.Firebird.addin.xml
  M extras/MonoDevelop.Database/MonoDevelop.Database.Sql.MySql/MonoDevelop.Database.Sql.MySql.addin.xml
  M extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Npgsql/MonoDevelop.Database.Sql.Npgsql.addin.xml
  M extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Odbc/MonoDevelop.Database.Sql.Odbc.addin.xml
  M extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Oracle/MonoDevelop.Database.Sql.Oracle.addin.xml
  M extras/MonoDevelop.Database/MonoDevelop.Database.Sql.SqlServer/MonoDevelop.Database.Sql.SqlServer.addin.xml
  M extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sqlite/MonoDevelop.Database.Sql.Sqlite.addin.xml
  M extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sybase/MonoDevelop.Database.Sql.Sybase.addin.xml
  M extras/MonoDevelop.Database/MonoDevelop.Database.Sql/MonoDevelop.Database.Sql.addin.xml
  M extras/MonoDevelop.Database/configure.in
  M extras/MonoDevelop.Debugger.Gdb/Manifest.addin.xml
  M extras/MonoDevelop.Debugger.Gdb/configure
  M extras/MonoDevelop.Debugger.Mdb/Mono.Debugging.Backend.Mdb.AspNet/Manifest.addin.xml
  M extras/MonoDevelop.Debugger.Mdb/Mono.Debugging.Backend.Mdb/Manifest.addin.xml
  M extras/MonoDevelop.Debugger.Mdb/configure
  M extras/MonoDevelop.MeeGo/MonoDevelop.MeeGo.addin.xml
  M extras/MonoDevelop.MeeGo/configure
  M extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapBuddy/MonoDevelop.Profiling.HeapBuddy.addin.xml
  M extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapShot/MonoDevelop.Profiling.HeapShot.addin.xml
  M extras/MonoDevelop.Profiling/MonoDevelop.Profiling/MonoDevelop.Profiling.addin.xml
  M extras/MonoDevelop.Profiling/configure.in
  M extras/NemerleBinding/NemerleBinding.addin.xml
  M extras/OpenOfficeSamples/OpenOfficeSamples.addin.xml
  M extras/PyBinding/PyBinding/PyBinding.addin.xml
  M extras/PyBinding/configure
  M extras/ValaBinding/ValaBinding.addin.xml
  M extras/ValaBinding/configure.in
  M extras/WebKitWebBrowser/MonoDevelop.WebBrowsers.WebKitWebBrowser.addin.xml
  M extras/WebKitWebBrowser/configure
  M main/configure.in
  M main/external/xwt
  M main/src/addins/CBinding/CBinding.addin.xml
  M main/src/addins/CBinding/Compiler/GNUCompiler.cs
  M main/src/addins/CSharpBinding/CSharpBinding.addin.xml
  M main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux.addin.xml
  M main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.addin.xml
  M main/src/addins/MacPlatform/MacInterop/Keychain.cs
  M main/src/addins/MonoDevelop.CodeMetrics/MonoDevelop.CodeMetrics.addin.xml
  M main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.AspNet/Manifest.addin.xml
  M main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.Moonlight/Manifest.addin.xml
  M main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/Manifest.addin.xml
  M main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32.addin.xml
  M main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.addin.xml
  M main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.addin.xml
  M main/src/addins/MonoDevelop.GtkCore2/MonoDevelop.GtkCore2.addin.xml
  M main/src/addins/MonoDevelop.Moonlight/MonoDevelop.Moonlight.addin.xml
  M main/src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.addin.xml
  M main/src/addins/MonoDeveloperExtensions/MonoDeveloperExtensions.addin.xml
  M main/src/addins/NUnit/MonoDevelopNUnit.addin.xml
  M main/src/addins/TextTemplating/MonoDevelop.TextTemplating/MonoDevelop.TextTemplating.addin.xml
  M main/src/addins/VBNetBinding/VBNetBinding.addin.xml
  M main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git.addin.xml
  M main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix.addin.xml
  M main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.addin.xml
  M main/src/addins/VersionControl/MonoDevelop.VersionControl/VersionControl.addin.xml
  M main/src/addins/VersionControl/Subversion.Win32/Manifest.addin.xml
  M main/src/addins/WindowsPlatform/WindowsPlatform.addin.xml
  M main/src/core/MonoDevelop.Core/BuildVariables.cs
  M main/tests/TestRunner/MonoDevelop.TestRunner.addin.xml
  M version-checks

Modified: extras/AspNetEdit/AspNetEdit.addin.xml
===================================================================
@@ -6,7 +6,7 @@
        url         = "http://www.monodevelop.com/"
        description = "Visual Designer for ASP.NET Web Forms."
        category    = "Web Development"
-       version     = "4.1.13">
+       version     = "4.2">
 	
 	<Runtime>
 		<Import assembly = "AspNetEdit.dll"/>
@@ -14,11 +14,11 @@
 	</Runtime>
 
 	<Dependencies>
-		<Addin id="Core" version="4.1.13"/>
-		<Addin id="Ide" version="4.1.13"/>
-		<Addin id="Deployment" version="4.1.13" />
-		<Addin id="AspNet" version="4.1.13" />
-		<Addin id="DesignerSupport" version="4.1.13" />
+		<Addin id="Core" version="4.2"/>
+		<Addin id="Ide" version="4.2"/>
+		<Addin id="Deployment" version="4.2" />
+		<Addin id="AspNet" version="4.2" />
+		<Addin id="DesignerSupport" version="4.2" />
 	</Dependencies>
 	
 	<Extension path = "/MonoDevelop/Ide/DisplayBindings">

Modified: extras/AspNetEdit/configure
===================================================================
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-VERSION=4.1.13
+VERSION=4.2
 PACKAGE=aspnetedit
 prefix=/usr/local
 config=DEBUG

Modified: extras/BooBinding/BooBinding.addin.xml
===================================================================
@@ -6,7 +6,7 @@
        url         = "http://boo.codehaus.org"
        description = "Boo Language Binding"
        category    = "Language bindings"
-       version     = "4.1.13">
+       version     = "4.2">
 
   <Runtime>
     <Import assembly = "BooBinding.dll"/>
@@ -16,8 +16,8 @@
   <Localizer type="Gettext" catalog="monodevelop-boo"/>
   
   <Dependencies>
-    <Addin id="Core" version="4.1.13"/>
-    <Addin id="Ide" version="4.1.13"/>
+    <Addin id="Core" version="4.2"/>
+    <Addin id="Ide" version="4.2"/>
     <Assembly name="Boo.Lang.Compiler, Version=1.0.0.0" package="Boo" />
   </Dependencies>
 

Modified: extras/BooBinding/configure
===================================================================
@@ -1,10 +1,10 @@
 #!/bin/bash
-VERSION=4.1.13
+VERSION=4.2
 PACKAGE=monodevelop-boo
 prefix=/usr/local
 config=DEBUG
 configurations=" RELEASE DEBUG"
-common_packages="gtk-sharp-2.0;2.12.8 monodevelop;4.1.13 mono-addins;0.3 glib-sharp-2.0;2.12.8 monodevelop-core-addins;2.7 boo;0.7.9.2659"
+common_packages="gtk-sharp-2.0;2.12.8 monodevelop;4.2 mono-addins;0.3 glib-sharp-2.0;2.12.8 monodevelop-core-addins;2.7 boo;0.7.9.2659"
 
 
 usage ()

Modified: extras/GeckoWebBrowser/MonoDevelop.WebBrowsers.GeckoWebBrowser.addin.xml
===================================================================
@@ -6,10 +6,10 @@
        url         = "http://www.monodevelop.com"
        description = "Mozilla Web Browser component using GeckoSharp and GtkMozEmbed"
        category    = "Platform Support"
-       version     = "4.1.13">
+       version     = "4.2">
 
 	<Dependencies>
-		<Addin id = "Ide" version = "4.1.13"/>
+		<Addin id = "Ide" version = "4.2"/>
 	</Dependencies>
 	
 	<Extension path = "/MonoDevelop/Core/WebBrowsers">

Modified: extras/GeckoWebBrowser/configure
===================================================================
@@ -1,10 +1,10 @@
 #!/usr/bin/env bash
-VERSION=4.1.13
+VERSION=4.2
 PACKAGE=geckowebbrowser
 prefix=/usr/local
 config=DEBUG
 configurations=" RELEASE DEBUG"
-common_packages=" glib-sharp-2.0;2.12.8 gtk-sharp-2.0;2.12.8 gecko-sharp-2.0;0.12 monodevelop;4.1.13"
+common_packages=" glib-sharp-2.0;2.12.8 gtk-sharp-2.0;2.12.8 gecko-sharp-2.0;0.12 monodevelop;4.2"
 
 
 usage ()

Modified: extras/GtkSourceViewEditor/MonoDevelop.SourceEditor.addin.xml
===================================================================
@@ -6,15 +6,15 @@
        url         = ""
        description = "Provides a text editor for the MonoDevelop IDE based on GtkSourceView 2"
        category    = "MonoDevelop Core"
-       version     = "4.1.13">
+       version     = "4.2">
 	
 	<Runtime>
 		<Import assembly="MonoDevelop.SourceEditor.dll"/>
 	</Runtime>
 
 	<Dependencies>
-	    <Addin id="Core" version="4.1.13"/>
-	    <Addin id="Ide" version="4.1.13"/>
+	    <Addin id="Core" version="4.2"/>
+	    <Addin id="Ide" version="4.2"/>
 	</Dependencies>
 
 	<!-- Extension points -->

Modified: extras/JavaBinding/JavaBinding.addin.xml
===================================================================
@@ -6,7 +6,7 @@
        url         = "http://www.monodevelop.com"
        description = "Java Language Binding"
        category    = "Language bindings"
-       version     = "4.1.13">
+       version     = "4.2">
 
   <Runtime>
     <Import assembly = "JavaBinding.dll"/>
@@ -15,8 +15,8 @@
   <Localizer type="Gettext" catalog="monodevelop-java"/>
 
 	<Dependencies>
-		<Addin id="Core" version="4.1.13"/>
-		<Addin id="Ide" version="4.1.13"/>
+		<Addin id="Core" version="4.2"/>
+		<Addin id="Ide" version="4.2"/>
 	</Dependencies>
 	
   <Extension path = "/MonoDevelop/Ide/FileFilters">

Modified: extras/JavaBinding/configure
===================================================================
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-VERSION=4.1.13
+VERSION=4.2
 PACKAGE=monodevelop-java
 prefix=/usr/local
 config=DEBUG

Modified: extras/LuaBinding/LuaBinding.addin.xml
===================================================================
@@ -6,15 +6,15 @@
        url         = "http://www.monodevelop.com"
        description = "Lua Language Binding"
        category    = "Language bindings"
-       version     = "4.1.13">
+       version     = "4.2">
 
 	<Runtime>
 		<Import assembly = "LuaBinding.dll"/>
 	</Runtime>
 
 	<Dependencies>
-		<Addin id="Core" version="4.1.13"/>
-		<Addin id="Ide" version="4.1.13"/>
+		<Addin id="Core" version="4.2"/>
+		<Addin id="Ide" version="4.2"/>
 	</Dependencies>
 
 	<Extension path = "/MonoDevelop/Ide/FileFilters">

Modified: extras/MonoDevelop.AddinAuthoring/MonoDevelop.AddinAuthoring.addin.xml
===================================================================
@@ -5,12 +5,12 @@
         copyright   = "MIT X11"
         url         = "http://www.monodevelop.com"
         description = "This add-in provides utilities for creating Mono.Addins based libraries and applications"
-        version     = "4.1.13">
+        version     = "4.2">
  
 	<Dependencies>
-		<Addin id="Core" version="4.1.13"/>
-		<Addin id="Ide" version="4.1.13"/>
-		<Addin id="VersionControl" version="4.1.13"/>
+		<Addin id="Core" version="4.2"/>
+		<Addin id="Ide" version="4.2"/>
+		<Addin id="VersionControl" version="4.2"/>
 	</Dependencies>
 
 	<!-- Extension Points -->

Modified: extras/MonoDevelop.AddinAuthoring/configure
===================================================================
@@ -1,10 +1,10 @@
 #!/usr/bin/env bash
-VERSION=4.1.13
+VERSION=4.2
 PACKAGE=monodevelop_addinauthoring
 prefix=/usr/local
 config=DEBUG
 configurations=" RELEASE DEBUG"
-common_packages=" monodevelop;4.1.13 gtk-sharp-2.0;2.12.8 mono-addins-setup;0.4 mono-addins;0.5"
+common_packages=" monodevelop;4.2 gtk-sharp-2.0;2.12.8 mono-addins-setup;0.4 mono-addins;0.5"
 
 
 usage ()

Modified: extras/MonoDevelop.CodeAnalysis/MonoDevelop.CodeAnalysis.Gendarme/MonoDevelop.CodeAnalysis.Gendarme.addin.xml
===================================================================
@@ -6,7 +6,7 @@
 	url         = "http://code.google.com/p/md-codeanalysis"
 	description = "MonoDevelop CodeAnalysis addin"
 	category    = "Code Analysis"
-	version     = "4.1.13">
+	version     = "4.2">
 
 	<Runtime>
 		<Import assembly="MonoDevelop.CodeAnalysis.dll"/>

Modified: extras/MonoDevelop.CodeAnalysis/MonoDevelop.CodeAnalysis.Smokey/MonoDevelop.CodeAnalysis.Smokey.addin.xml
===================================================================
@@ -6,7 +6,7 @@
 	url         = "http://code.google.com/p/md-codeanalysis"
 	description = "MonoDevelop CodeAnalysis addin"
 	category    = "Code Analysis"
-	version     = "4.1.13">
+	version     = "4.2">
 
 	<Runtime>
 		<Import assembly="MonoDevelop.CodeAnalysis.dll"/>

Modified: extras/MonoDevelop.CodeAnalysis/MonoDevelop.CodeAnalysis/MonoDevelop.CodeAnalysis.addin.xml
===================================================================
@@ -6,11 +6,11 @@
 	url         = "http://code.google.com/p/md-codeanalysis"
 	description = "MonoDevelop CodeAnalysis addin"
 	category    = "Code Analysis"
-	version     = "4.1.13">
+	version     = "4.2">
 
 	<Dependencies>
-		<Addin id="Core" version="4.1.13"/>
-		<Addin id="Ide" version="4.1.13"/>
+		<Addin id="Core" version="4.2"/>
+		<Addin id="Ide" version="4.2"/>
 	</Dependencies>
 
 	<Extension path="/MonoDevelop/Ide/Commands">

Modified: extras/MonoDevelop.Database/MonoDevelop.Database.CodeGenerator/MonoDevelop.Database.CodeGenerator.addin.xml
===================================================================
@@ -6,7 +6,7 @@
 	url		= "http://www.monodevelop.com"
 	description	= "Database CodeGenerator Module"
 	category	= "Database"
-	version		= "4.1.13">
+	version		= "4.2">
     
 	<Runtime>
 		<Import assembly="MonoDevelop.Database.CodeGenerator.dll"/>
@@ -15,11 +15,11 @@
   	<Localizer type="Gettext" catalog="monodevelop-database"/>
 
 	<Dependencies>
-		<Addin id="Core" version="4.1.13"/>
-		<Addin id="Ide" version="4.1.13"/>
-		<Addin id="Database.Sql" version="4.1.13"/>
-		<Addin id="Database.Components" version="4.1.13"/>
-		<Addin id="Database.Query" version="4.1.13"/>
+		<Addin id="Core" version="4.2"/>
+		<Addin id="Ide" version="4.2"/>
+		<Addin id="Database.Sql" version="4.2"/>
+		<Addin id="Database.Components" version="4.2"/>
+		<Addin id="Database.Query" version="4.2"/>
 	</Dependencies>
 
 	<Extension path = "/MonoDevelop/Ide/Commands">

Modified: extras/MonoDevelop.Database/MonoDevelop.Database.Components/MonoDevelop.Database.Components.addin.xml
===================================================================
@@ -6,7 +6,7 @@
 	url		= "http://www.monodevelop.com"
 	description	= "Database Components Module"
 	category	= "Database"
-	version		= "4.1.13">
+	version		= "4.2">
     
 	<Runtime>
 		<Import assembly="MonoDevelop.Database.Components.dll"/>
@@ -15,10 +15,10 @@
   	<Localizer type="Gettext" catalog="monodevelop-database"/>
 
 	<Dependencies>
-		<Addin id="Core" version="4.1.13"/>
-		<Addin id="Ide" version="4.1.13"/>
-		<Addin id="Database.Sql" version="4.1.13"/>
-		<Addin id="SourceEditor2" version="4.1.13"/>
+		<Addin id="Core" version="4.2"/>
+		<Addin id="Ide" version="4.2"/>
+		<Addin id="Database.Sql" version="4.2"/>
+		<Addin id="SourceEditor2" version="4.2"/>
 	</Dependencies>
 
 	<ExtensionPoint path = "/MonoDevelop/Database/DataGrid/Renderers" name = "DataGrid renderers">

Modified: extras/MonoDevelop.Database/MonoDevelop.Database.ConnectionManager/MonoDevelop.Database.ConnectionManager.addin.xml
===================================================================
@@ -6,7 +6,7 @@
 	url		= "http://www.monodevelop.com"
 	description	= "Database ConnectionManager Module"
 	category    = "Database"
-	version		= "4.1.13">
+	version		= "4.2">
     
 	<Runtime>
 		<Import assembly="MonoDevelop.Database.ConnectionManager.dll"/>
@@ -15,12 +15,12 @@
   	<Localizer type="Gettext" catalog="monodevelop-database"/>
 
 	<Dependencies>
-		<Addin id="Core" version="4.1.13"/>
-		<Addin id="Ide" version="4.1.13"/>
-		<Addin id="Database.Sql" version="4.1.13"/>
-		<Addin id="Database.Components" version="4.1.13"/>
-		<Addin id="Database.Query" version="4.1.13"/>
-		<Addin id="Database.Designer" version="4.1.13"/>
+		<Addin id="Core" version="4.2"/>
+		<Addin id="Ide" version="4.2"/>
+		<Addin id="Database.Sql" version="4.2"/>
+		<Addin id="Database.Components" version="4.2"/>
+		<Addin id="Database.Query" version="4.2"/>
+		<Addin id="Database.Designer" version="4.2"/>
 	</Dependencies>
 
 	<Extension path = "/MonoDevelop/Ide/Pads">

Modified: extras/MonoDevelop.Database/MonoDevelop.Database.Designer/MonoDevelop.Database.Designer.addin.xml
===================================================================
@@ -6,7 +6,7 @@
 	url		= "http://www.monodevelop.com"
 	description	= "Database Designer Module"
 	category    = "Database"
-	version		= "4.1.13">
+	version		= "4.2">
     
 	<Runtime>
 		<Import assembly="MonoDevelop.Database.Designer.dll"/>
@@ -15,9 +15,9 @@
   	<Localizer type="Gettext" catalog="monodevelop-database"/>
 
 	<Dependencies>
-		<Addin id="Core" version="4.1.13"/>
-		<Addin id="Ide" version="4.1.13"/>
-		<Addin id="Database.Sql" version="4.1.13"/>
+		<Addin id="Core" version="4.2"/>
+		<Addin id="Ide" version="4.2"/>
+		<Addin id="Database.Sql" version="4.2"/>
 	</Dependencies>
 
 </Addin>

Modified: extras/MonoDevelop.Database/MonoDevelop.Database.Query/MonoDevelop.Database.Query.addin.xml
===================================================================
@@ -6,7 +6,7 @@
 	url		= "http://www.monodevelop.com"
 	description	= "Database Query Module"
 	category    = "Database"
-	version		= "4.1.13">
+	version		= "4.2">
     
 	<Runtime>
 		<Import assembly="MonoDevelop.Database.Query.dll"/>
@@ -15,10 +15,10 @@
   	<Localizer type="Gettext" catalog="monodevelop-database"/>
 
 	<Dependencies>
-		<Addin id="Core" version="4.1.13"/>
-		<Addin id="Ide" version="4.1.13"/>
-		<Addin id="Database.Sql" version="4.1.13"/>
-		<Addin id="Database.Components" version="4.1.13"/>
+		<Addin id="Core" version="4.2"/>
+		<Addin id="Ide" version="4.2"/>
+		<Addin id="Database.Sql" version="4.2"/>
+		<Addin id="Database.Components" version="4.2"/>
 	</Dependencies>
 
 	<ExtensionPoint path = "/MonoDevelop/Database/ToolBar/SqlQueryView">

Modified: extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Firebird/MonoDevelop.Database.Sql.Firebird.addin.xml
===================================================================
@@ -6,7 +6,7 @@
 	url		= "http://www.monodevelop.com"
 	description	= "Database Module"
 	category    = "Database"
-	version		= "4.1.13">
+	version		= "4.2">
     
 	<Runtime>
 		<Import assembly="MonoDevelop.Database.Sql.Firebird.dll"/>
@@ -15,7 +15,7 @@
   	<Localizer type="Gettext" catalog="monodevelop-database"/>
 
 	<Dependencies>
-		<Addin id="MonoDevelop.Database.Sql" version="4.1.13"/>
+		<Addin id="MonoDevelop.Database.Sql" version="4.2"/>
 	</Dependencies>
 
 	<Extension path = "/Mono/Data/Sql">

Modified: extras/MonoDevelop.Database/MonoDevelop.Database.Sql.MySql/MonoDevelop.Database.Sql.MySql.addin.xml
===================================================================
@@ -6,7 +6,7 @@
 	url		= "http://www.monodevelop.com"
 	description	= "Database Module"
 	category    = "Database"
-	version		= "4.1.13">
+	version		= "4.2">
     
 	<Runtime>
 		<Import assembly="MonoDevelop.Database.Sql.MySql.dll"/>
@@ -15,12 +15,12 @@
   	<Localizer type="Gettext" catalog="monodevelop-database"/>
 
 	<Dependencies>
-		<Addin id="Core" version="4.1.13"/>
-		<Addin id="Ide" version="4.1.13"/>
-		<Addin id="Database.Sql" version="4.1.13"/>
-		<Addin id="Database.Components" version="4.1.13"/>
-		<Addin id="Database.Designer" version="4.1.13"/>
-		<Addin id="SourceEditor2" version="4.1.13"/>
+		<Addin id="Core" version="4.2"/>
+		<Addin id="Ide" version="4.2"/>
+		<Addin id="Database.Sql" version="4.2"/>
+		<Addin id="Database.Components" version="4.2"/>
+		<Addin id="Database.Designer" version="4.2"/>
+		<Addin id="SourceEditor2" version="4.2"/>
 	</Dependencies>
 
 	<Extension path = "/MonoDevelop/Database/Sql">

Modified: extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Npgsql/MonoDevelop.Database.Sql.Npgsql.addin.xml
===================================================================
@@ -6,7 +6,7 @@
 	url		= "http://www.monodevelop.com"
 	description	= "Database Module"
 	category    = "Database"
-	version		= "4.1.13">
+	version		= "4.2">
     
 	<Runtime>
 		<Import assembly="MonoDevelop.Database.Sql.Npgsql.dll"/>
@@ -15,12 +15,12 @@
   	<Localizer type="Gettext" catalog="monodevelop-database"/>
 
 	<Dependencies>
-		<Addin id="Core" version="4.1.13"/>
-		<Addin id="Ide" version="4.1.13"/>
-		<Addin id="Database.Sql" version="4.1.13"/>
-		<Addin id="Database.Components" version="4.1.13"/>
-		<Addin id="Database.Designer" version="4.1.13"/>
-		<Addin id="SourceEditor2" version="4.1.13"/>
+		<Addin id="Core" version="4.2"/>
+		<Addin id="Ide" version="4.2"/>
+		<Addin id="Database.Sql" version="4.2"/>
+		<Addin id="Database.Components" version="4.2"/>
+		<Addin id="Database.Designer" version="4.2"/>
+		<Addin id="SourceEditor2" version="4.2"/>
 	</Dependencies>
 
 	<Extension path = "/MonoDevelop/Database/Sql">

Modified: extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Odbc/MonoDevelop.Database.Sql.Odbc.addin.xml
===================================================================
@@ -6,7 +6,7 @@
 	url		= "http://www.monodevelop.com"
 	description	= "Database Module"
 	category    = "Database"
-	version		= "4.1.13">
+	version		= "4.2">
     
 	<Runtime>
 		<Import assembly="MonoDevelop.Database.Sql.Odbc.dll"/>
@@ -15,11 +15,11 @@
   	<Localizer type="Gettext" catalog="monodevelop-database"/>
 
 	<Dependencies>
-		<Addin id="Core" version="4.1.13"/>
-		<Addin id="Ide" version="4.1.13"/>
-		<Addin id="Database.Sql" version="4.1.13"/>
-		<Addin id="Database.Components" version="4.1.13"/>
-		<Addin id="Database.Designer" version="4.1.13"/>
+		<Addin id="Core" version="4.2"/>
+		<Addin id="Ide" version="4.2"/>
+		<Addin id="Database.Sql" version="4.2"/>
+		<Addin id="Database.Components" version="4.2"/>
+		<Addin id="Database.Designer" version="4.2"/>
 	</Dependencies>
 
 	<Extension path = "/MonoDevelop/Database/Sql">

Modified: extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Oracle/MonoDevelop.Database.Sql.Oracle.addin.xml
===================================================================
@@ -6,7 +6,7 @@
 	url		= "http://www.monodevelop.com"
 	description	= "Database Module"
 	category    = "Database"
-	version		= "4.1.13">
+	version		= "4.2">
     
 	<Runtime>
 		<Import assembly="MonoDevelop.Database.Sql.Oracle.dll"/>
@@ -15,11 +15,11 @@
   	<Localizer type="Gettext" catalog="monodevelop-database"/>
 
 	<Dependencies>
-		<Addin id="Core" version="4.1.13"/>
-		<Addin id="Ide" version="4.1.13"/>
-		<Addin id="Database.Sql" version="4.1.13"/>
-		<Addin id="Database.Components" version="4.1.13"/>
-		<Addin id="Database.Designer" version="4.1.13"/>
+		<Addin id="Core" version="4.2"/>
+		<Addin id="Ide" version="4.2"/>
+		<Addin id="Database.Sql" version="4.2"/>
+		<Addin id="Database.Components" version="4.2"/>
+		<Addin id="Database.Designer" version="4.2"/>
 	</Dependencies>
 
 	<Extension path = "/MonoDevelop/Database/Sql">

Modified: extras/MonoDevelop.Database/MonoDevelop.Database.Sql.SqlServer/MonoDevelop.Database.Sql.SqlServer.addin.xml
===================================================================
@@ -6,7 +6,7 @@
 	url		= "http://www.monodevelop.com"
 	description	= "Database Module"
 	category    = "Database"
-	version		= "4.1.13">
+	version		= "4.2">
     
 	<Runtime>
 		<Import assembly="MonoDevelop.Database.Sql.SqlServer.dll"/>
@@ -15,12 +15,12 @@
   	<Localizer type="Gettext" catalog="monodevelop-database"/>
 
 	<Dependencies>
-		<Addin id="Core" version="4.1.13"/>
-		<Addin id="Ide" version="4.1.13"/>
-		<Addin id="Database.Sql" version="4.1.13"/>
-		<Addin id="Database.Components" version="4.1.13"/>
-		<Addin id="Database.Designer" version="4.1.13"/>
-		<Addin id="SourceEditor2" version="4.1.13"/>
+		<Addin id="Core" version="4.2"/>
+		<Addin id="Ide" version="4.2"/>
+		<Addin id="Database.Sql" version="4.2"/>
+		<Addin id="Database.Components" version="4.2"/>
+		<Addin id="Database.Designer" version="4.2"/>
+		<Addin id="SourceEditor2" version="4.2"/>
 	</Dependencies>
 
 	<Extension path = "/MonoDevelop/Database/Sql">

Modified: extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sqlite/MonoDevelop.Database.Sql.Sqlite.addin.xml
===================================================================
@@ -6,7 +6,7 @@
 	url		= "http://www.monodevelop.com"
 	description	= "Database Module"
 	category    = "Database"
-	version		= "4.1.13">
+	version		= "4.2">
     
 	<Runtime>
 		<Import assembly="MonoDevelop.Database.Sql.Sqlite.dll"/>
@@ -15,12 +15,12 @@
   	<Localizer type="Gettext" catalog="monodevelop-database"/>
 
 	<Dependencies>
-		<Addin id="Core" version="4.1.13"/>
-		<Addin id="Ide" version="4.1.13"/>
-		<Addin id="Database.Sql" version="4.1.13"/>
-		<Addin id="Database.Components" version="4.1.13"/>
-		<Addin id="Database.Designer" version="4.1.13"/>
-		<Addin id="SourceEditor2" version="4.1.13"/>
+		<Addin id="Core" version="4.2"/>
+		<Addin id="Ide" version="4.2"/>
+		<Addin id="Database.Sql" version="4.2"/>
+		<Addin id="Database.Components" version="4.2"/>
+		<Addin id="Database.Designer" version="4.2"/>
+		<Addin id="SourceEditor2" version="4.2"/>
 	</Dependencies>
 
 	<Extension path = "/MonoDevelop/Database/Sql">

Modified: extras/MonoDevelop.Database/MonoDevelop.Database.Sql.Sybase/MonoDevelop.Database.Sql.Sybase.addin.xml
===================================================================
@@ -6,7 +6,7 @@
 	url		= "http://www.monodevelop.com"
 	description	= "Database Module"
 	category    = "Database"
-	version		= "4.1.13">
+	version		= "4.2">
     
 	<Runtime>
 		<Import assembly="MonoDevelop.Database.Sql.Sybase.dll"/>
@@ -15,7 +15,7 @@
   	<Localizer type="Gettext" catalog="monodevelop-database"/>
 
 	<Dependencies>
-		<Addin id="MonoDevelop.Database.Sql" version="4.1.13"/>
+		<Addin id="MonoDevelop.Database.Sql" version="4.2"/>
 	</Dependencies>
 
 	<Extension path = "/Mono/Data/Sql">

Modified: extras/MonoDevelop.Database/MonoDevelop.Database.Sql/MonoDevelop.Database.Sql.addin.xml
===================================================================
@@ -6,14 +6,14 @@
 	url		= "http://www.monodevelop.com"
 	description	= "Database Module"
 	category	= "Database"
-	version		= "4.1.13">
+	version		= "4.2">
     
 	<Runtime>
 		<Import assembly="MonoDevelop.Database.Sql.dll"/>
 	</Runtime>
 
 	<Dependencies>
-		<Addin id="Core" version="4.1.13"/>
+		<Addin id="Core" version="4.2"/>
 	</Dependencies>
 
   	<Localizer type="Gettext" catalog="monodevelop-database"/>

Modified: extras/MonoDevelop.Database/configure.in
===================================================================
@@ -1,4 +1,4 @@
-AC_INIT([monodevelop-database], 4.1.13, [[email protected]])
+AC_INIT([monodevelop-database], 4.2, [[email protected]])
 AC_PREREQ(2.53)
 AM_INIT_AUTOMAKE([1.9 tar-ustar])
 AM_MAINTAINER_MODE
@@ -52,7 +52,7 @@ fi
 
 dnl hard dependencies
 MONOADDINS_REQUIRED_VERSION=0.4
-MONODEVELOP_REQUIRED_VERSION=4.1.13
+MONODEVELOP_REQUIRED_VERSION=4.2
 GTKSHARP_REQUIRED_VERSION=2.12.8
 
 PKG_CHECK_MODULES(MONO_ADDINS, mono-addins >= $MONOADDINS_REQUIRED_VERSION)

Modified: extras/MonoDevelop.Debugger.Gdb/Manifest.addin.xml
===================================================================
@@ -5,12 +5,12 @@
        description = "GNU Debugger support for Mono.Debugging"
        copyright   = "MIT X11"
        category = "Debugging"
-       version   = "4.1.13">
+       version   = "4.2">
 
 	<Dependencies>
-		<Addin id="MonoDevelop.Core" version="4.1.13"/>
-		<Addin id="MonoDevelop.Ide" version="4.1.13"/>
-		<Addin id="MonoDevelop.Debugger" version="4.1.13"/>
+		<Addin id="MonoDevelop.Core" version="4.2"/>
+		<Addin id="MonoDevelop.Ide" version="4.2"/>
+		<Addin id="MonoDevelop.Debugger" version="4.2"/>
 	</Dependencies>
 	
 	<Extension path="/MonoDevelop/Debugging/DebuggerEngines">

Modified: extras/MonoDevelop.Debugger.Gdb/configure
===================================================================
@@ -1,10 +1,10 @@
 #!/usr/bin/env bash
-VERSION=4.1.13
+VERSION=4.2
 PACKAGE=monodevelop-debugger-gdb
 prefix=/usr/local
 config=DEBUG
 configurations=" RELEASE DEBUG"
-common_packages=" monodevelop;4.1.13"
+common_packages=" monodevelop;4.2"
 
 
 usage ()

Modified: extras/MonoDevelop.Debugger.Mdb/Mono.Debugging.Backend.Mdb.AspNet/Manifest.addin.xml
===================================================================
@@ -5,14 +5,14 @@
        description = "Managed Debugging Engine support for MDB"
        copyright   = "MIT X11"
        category = "Debugging"
-       version   = "4.1.13">
+       version   = "4.2">
 
 	<Dependencies>
-		<Addin id="MonoDevelop.Core" version="4.1.13"/>
-		<Addin id="MonoDevelop.Ide" version="4.1.13"/>
-		<Addin id="MonoDevelop.Debugger" version="4.1.13"/>
-		<Addin id="MonoDevelop.Debugger.Mdb" version="4.1.13"/>
-		<Addin id="MonoDevelop.AspNet" version="4.1.13"/>
+		<Addin id="MonoDevelop.Core" version="4.2"/>
+		<Addin id="MonoDevelop.Ide" version="4.2"/>
+		<Addin id="MonoDevelop.Debugger" version="4.2"/>
+		<Addin id="MonoDevelop.Debugger.Mdb" version="4.2"/>
+		<Addin id="MonoDevelop.AspNet" version="4.2"/>
 	</Dependencies>
 	
 	<Extension path="/MonoDevelop/Debugging/DebuggerEngines">

Modified: extras/MonoDevelop.Debugger.Mdb/Mono.Debugging.Backend.Mdb/Manifest.addin.xml
===================================================================
@@ -5,12 +5,12 @@
        description = "Managed Debugging Engine support for MDB"
        copyright   = "MIT X11"
        category = "Debugging"
-       version   = "4.1.13">
+       version   = "4.2">
 
 	<Dependencies>
-		<Addin id="MonoDevelop.Core" version="4.1.13"/>
-		<Addin id="MonoDevelop.Ide" version="4.1.13"/>
-		<Addin id="MonoDevelop.Debugger" version="4.1.13"/>
+		<Addin id="MonoDevelop.Core" version="4.2"/>
+		<Addin id="MonoDevelop.Ide" version="4.2"/>
+		<Addin id="MonoDevelop.Debugger" version="4.2"/>
 	</Dependencies>
 	
 	<Extension path="/MonoDevelop/Debugging/DebuggerEngines">

Modified: extras/MonoDevelop.Debugger.Mdb/configure
===================================================================
@@ -1,10 +1,10 @@
 #!/usr/bin/env bash
-VERSION=4.1.13
+VERSION=4.2
 PACKAGE=monodevelop-debugger-mdb
 prefix=/usr/local
 config=DEBUG
 configurations=" RELEASE DEBUG"
-common_packages=" mono-addins;0.3 mono-debugger;2.0 monodevelop;4.1.13 monodevelop-core-addins;2.7"
+common_packages=" mono-addins;0.3 mono-debugger;2.0 monodevelop;4.2 monodevelop-core-addins;2.7"
 
 
 usage ()

Modified: extras/MonoDevelop.MeeGo/MonoDevelop.MeeGo.addin.xml
===================================================================
@@ -6,19 +6,19 @@
        url         = "http://monodevelop.com/"
        description = "Support for developing and deploying MeeGo applications using Mono."
        category    = "Mobile Development"
-       version     = "4.1.13">
+       version     = "4.2">
 	
 	<Runtime>
 		<Import file = "Templates/MeeGoGtkProject.xpt.xml"/>
 	</Runtime>
 
 	<Dependencies>
-		<Addin id="Core" version="4.1.13"/>
-		<Addin id="Ide" version="4.1.13"/>
-		<Addin id="Debugger" version="4.1.13"/>
-		<Addin id="Debugger.Soft" version="4.1.13"/>
-		<Addin id="GtkCore" version="4.1.13"/>
-		<Addin id="CSharpBinding" version="4.1.13"/>
+		<Addin id="Core" version="4.2"/>
+		<Addin id="Ide" version="4.2"/>
+		<Addin id="Debugger" version="4.2"/>
+		<Addin id="Debugger.Soft" version="4.2"/>
+		<Addin id="GtkCore" version="4.2"/>
+		<Addin id="CSharpBinding" version="4.2"/>
 	</Dependencies>
 
 	<Extension path = "/MonoDevelop/Ide/ProjectTemplates">

Modified: extras/MonoDevelop.MeeGo/configure
===================================================================
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 prefix=/usr/local
-common_packages=" mono-addins;0.3 monodevelop;4.1.13 monodevelop-core-addins;2.7"
+common_packages=" mono-addins;0.3 monodevelop;4.2 monodevelop-core-addins;2.7"
 
 usage ()
 {

Modified: extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapBuddy/MonoDevelop.Profiling.HeapBuddy.addin.xml
===================================================================
@@ -6,16 +6,16 @@
 	url         = "http://www.monodevelop.com"
 	description = "HeapBuddy Profiler Add-in"
 	category    = "Profiling"
-	version     = "4.1.13">
+	version     = "4.2">
 
 	<Runtime>
 		<Import assembly="MonoDevelop.Profiling.HeapBuddy.dll"/>
 	</Runtime>
 
 	<Dependencies>
-		<Addin id="Core" version="4.1.13"/>
-		<Addin id="Ide" version="4.1.13"/>
-		<Addin id="Profiling" version="4.1.13"/>
+		<Addin id="Core" version="4.2"/>
+		<Addin id="Ide" version="4.2"/>
+		<Addin id="Profiling" version="4.2"/>
 	</Dependencies>
 
 	<ExtensionPoint path = "/MonoDevelop/Profiling/ContextMenu/ProfilingPad/HeapBuddyProfilingSnapshotNode" name = "HeapBuddy snapshot node context menu">


Modified: extras/MonoDevelop.Profiling/MonoDevelop.Profiling.HeapShot/MonoDevelop.Profiling.HeapShot.addin.xml
===================================================================
@@ -6,16 +6,16 @@
 	url         = "http://www.monodevelop.com"
 	description = "HeapShot Profiler Add-in"
 	category    = "Profiling"
-	version     = "4.1.13">
+	version     = "4.2">
 
 	<Runtime>
 		<Import assembly="MonoDevelop.Profiling.HeapShot.dll"/>
 	</Runtime>
 
 	<Dependencies>
-		<Addin id="Core" version="4.1.13"/>
-		<Addin id="Ide" version="4.1.13"/>
-		<Addin id="Profiling" version="4.1.13"/>
+		<Addin id="Core" version="4.2"/>
+		<Addin id="Ide" version="4.2"/>
+		<Addin id="Profiling" version="4.2"/>
 	</Dependencies>
 
 	<ExtensionPoint path = "/MonoDevelop/Profiling/ContextMenu/ProfilingPad/HeapShotProfilingSnapshotNode" name = "HeapShot snapshot node context menu">


Modified: extras/MonoDevelop.Profiling/MonoDevelop.Profiling/MonoDevelop.Profiling.addin.xml
===================================================================
@@ -6,15 +6,15 @@
 	url         = "http://www.monodevelop.com"
 	description = "MonoDevelop Profiling Addin"
 	category    = "Profiling"
-	version     = "4.1.13">
+	version     = "4.2">
 
 	<Runtime>
 		<Import assembly="MonoDevelop.Profiling.dll"/>
 	</Runtime>
 
 	<Dependencies>
-		<Addin id="Core" version="4.1.13"/>
-		<Addin id="Ide" version="4.1.13"/>
+		<Addin id="Core" version="4.2"/>
+		<Addin id="Ide" version="4.2"/>
 	</Dependencies>
 
 	<ExtensionPoint path = "/MonoDevelop/Profiling/ToolBar/ProfilingPad" name = "Profiling pad toolbar">


Modified: extras/MonoDevelop.Profiling/configure.in
===================================================================
@@ -1,4 +1,4 @@
-AC_INIT([monodevelop-profiling], 4.1.13, [[email protected]])
+AC_INIT([monodevelop-profiling], 4.2, [[email protected]])
 AC_PREREQ(2.53)
 AM_INIT_AUTOMAKE([1.9 tar-ustar])
 AM_MAINTAINER_MODE
@@ -42,7 +42,7 @@ fi
 
 dnl hard dependencies
 MONOADDINS_REQUIRED_VERSION=0.3
-MONODEVELOP_REQUIRED_VERSION=4.1.13
+MONODEVELOP_REQUIRED_VERSION=4.2
 GTKSHARP_REQUIRED_VERSION=2.12.8
 
 PKG_CHECK_MODULES(MONO_ADDINS, mono-addins >= $MONOADDINS_REQUIRED_VERSION)

Modified: extras/NemerleBinding/NemerleBinding.addin.xml
===================================================================
@@ -6,15 +6,15 @@
        url         = "http://www.monodevelop.com"
        description = "Nemerle Language Binding"
        category    = "Language bindings"
-       version     = "4.1.13">
+       version     = "4.2">
 
   <Runtime>
     <Import assembly = "NemerleBinding.dll"/>
   </Runtime>
 
 	<Dependencies>
-		<Addin id="Core" version="4.1.13"/>
-		<Addin id="Ide" version="4.1.13"/>
+		<Addin id="Core" version="4.2"/>
+		<Addin id="Ide" version="4.2"/>
 	</Dependencies>
 	
   <Extension path = "/MonoDevelop/ProjectModel/Ambiences">

Modified: extras/OpenOfficeSamples/OpenOfficeSamples.addin.xml
===================================================================
@@ -6,7 +6,7 @@
        url         = "http://www.monodevelop.com/"
        description = "Samples for automating OpenOffice using Mono."
        category    = "Templates"
-       version     = "4.1.13">
+       version     = "4.2">
 	
 	<Runtime>
 		<Import file = "OpenOfficeSpreadsheetSample.xpt.xml"/>
@@ -18,8 +18,8 @@
 	</Runtime>
 
 	<Dependencies>
-		<Addin id = "Ide" version="4.1.13"/>
-		<Addin id = "CSharpBinding" version = "4.1.13" />
+		<Addin id = "Ide" version="4.2"/>
+		<Addin id = "CSharpBinding" version = "4.2" />
 	</Dependencies>
 
 	<Extension path = "/MonoDevelop/Ide/ProjectTemplates">

Modified: extras/PyBinding/PyBinding/PyBinding.addin.xml
===================================================================
@@ -6,16 +6,16 @@
        url         = "http://www.monodevelop.com"
        description = "Python Language binding"
        category    = "Language bindings"
-       version     = "4.1.13">
+       version     = "4.2">
 
     <Runtime>
         <Import assembly = "PyBinding.dll"/>
     </Runtime>
 
     <Dependencies>
-        <Addin id = "Core"          version = "4.1.13"/>
-        <Addin id = "Ide"           version = "4.1.13"/>
-        <Addin id = "SourceEditor2" version = "4.1.13"/>
+        <Addin id = "Core"          version = "4.2"/>
+        <Addin id = "Ide"           version = "4.2"/>
+        <Addin id = "SourceEditor2" version = "4.2"/>
     </Dependencies>
     
     <Extension path = "/MonoDevelop/Core/StockIcons">

Modified: extras/PyBinding/configure
===================================================================
@@ -1,10 +1,10 @@
 #!/usr/bin/env bash
-VERSION=4.1.13
+VERSION=4.2
 PACKAGE=monodevelop-python
 prefix=/usr/local
 config=DEBUG
 configurations=" RELEASE DEBUG"
-common_packages=" gtk-sharp-2.0;2.12.8 mono-addins;0.3 monodevelop;4.1.13 monodevelop-core-addins;2.7"
+common_packages=" gtk-sharp-2.0;2.12.8 mono-addins;0.3 monodevelop;4.2 monodevelop-core-addins;2.7"
 
 
 usage ()

Modified: extras/ValaBinding/ValaBinding.addin.xml
===================================================================
@@ -6,14 +6,14 @@
        url         = "http://www.monodevelop.com"
        description = "Vala Language binding"
        category    = "Language bindings"
-       version     = "4.1.13">
+       version     = "4.2">
 
 	<Dependencies>
-		<Addin id = "Core" version = "4.1.13"/>
-		<Addin id = "Ide" version = "4.1.13"/>
-		<Addin id = "Deployment" version = "4.1.13"/>
-		<Addin id = "Deployment.Linux" version = "4.1.13"/>
-		<Addin id = "Autotools" version = "4.1.13"/>
+		<Addin id = "Core" version = "4.2"/>
+		<Addin id = "Ide" version = "4.2"/>
+		<Addin id = "Deployment" version = "4.2"/>
+		<Addin id = "Deployment.Linux" version = "4.2"/>
+		<Addin id = "Autotools" version = "4.2"/>
 	</Dependencies>
 	
 	<Extension path = "/MonoDevelop/Core/StockIcons">

Modified: extras/ValaBinding/configure.in
===================================================================
@@ -1,4 +1,4 @@
-AC_INIT([monodevelop-vala], 4.1.13, [[email protected]])
+AC_INIT([monodevelop-vala], 4.2, [[email protected]])
 AC_PREREQ(2.53)
 AM_INIT_AUTOMAKE(1.9 tar-ustar)
 AM_MAINTAINER_MODE
@@ -52,7 +52,7 @@ fi
 dnl hard dependencies
 MONOADDINS_REQUIRED_VERSION=0.3
 GTKSHARP_REQUIRED_VERSION=2.12.8
-MONODEVELOP_REQUIRED_VERSION=4.1.13
+MONODEVELOP_REQUIRED_VERSION=4.2
 LIBVALA_REQUIRED_VERSION=0.12.0
 
 PKG_CHECK_MODULES(MONO_ADDINS, mono-addins >= $MONOADDINS_REQUIRED_VERSION)

Modified: extras/WebKitWebBrowser/MonoDevelop.WebBrowsers.WebKitWebBrowser.addin.xml
===================================================================
@@ -6,10 +6,10 @@
        url         = "http://www.monodevelop.com"
        description = "WebKit Web Browser component"
        category    = "Platform Support"
-       version     = "4.1.13">
+       version     = "4.2">
 
 	<Dependencies>
-		<Addin id = "Ide" version = "4.1.13"/>
+		<Addin id = "Ide" version = "4.2"/>
 	</Dependencies>
 	
 	<Extension path = "/MonoDevelop/Core/WebBrowsers">

Modified: extras/WebKitWebBrowser/configure
===================================================================
@@ -1,10 +1,10 @@
 #!/usr/bin/env bash
-VERSION=4.1.13
+VERSION=4.2
 PACKAGE=webkitwebbrowser
 prefix=/usr/local
 config=DEBUG
 configurations=" RELEASE DEBUG"
-common_packages=" glade-sharp-2.0;2.12.8 glib-sharp-2.0;2.12.8 gtk-sharp-2.0;2.12.8 monodevelop;4.1.13 webkit-sharp-1.0;0.2"
+common_packages=" glade-sharp-2.0;2.12.8 glib-sharp-2.0;2.12.8 gtk-sharp-2.0;2.12.8 monodevelop;4.2 webkit-sharp-1.0;0.2"
 
 
 usage ()

Modified: main/configure.in
===================================================================
@@ -1,4 +1,4 @@
-AC_INIT([monodevelop], 4.1.13, [[email protected]])
+AC_INIT([monodevelop], 4.2, [[email protected]])
 AC_PREREQ(2.53)
 AM_INIT_AUTOMAKE([1.10 tar-ustar])
 AM_MAINTAINER_MODE
@@ -12,7 +12,7 @@ ASSEMBLY_VERSION=4.0.0.0
 # the C# side of things. It should be one of the following two formats:
 # 1) "VERSION_NUMBER"					"2.0"
 # 2) "VERSION_NUMBER BUILD_TYPE BUILD_NUMBER"		"2.0 Alpha 1"
-PACKAGE_VERSION_LABEL="4.1.13"
+PACKAGE_VERSION_LABEL="4.2"
 
 COMPAT_ADDIN_VERSION=4.0
 

Modified: main/external/xwt
===================================================================
@@ -1 +1 @@
-Subproject commit 4ba97a9b9735565e706c03c5755a648d997a52c6
+Subproject commit 4894929736f80101fd56c31b2b076fa7765d2057

Modified: main/src/addins/CBinding/CBinding.addin.xml
===================================================================
@@ -6,16 +6,16 @@
        url         = "http://www.monodevelop.com"
        description = "C/C++ Language binding"
        category    = "Language bindings"
-       version     = "4.1.13">
+       version     = "4.2">
 
 	<Dependencies>
-		<Addin id = "Core" version = "4.1.13"/>
-		<Addin id = "Ide" version = "4.1.13"/>
-		<Addin id = "Deployment" version = "4.1.13"/>
-		<Addin id = "Deployment.Linux" version = "4.1.13"/>
-		<Addin id = "SourceEditor2" version = "4.1.13" />
-		<Addin id = "DesignerSupport" version = "4.1.13" />
-		<Addin id = "Refactoring" version = "4.1.13" />
+		<Addin id = "Core" version = "4.2"/>
+		<Addin id = "Ide" version = "4.2"/>
+		<Addin id = "Deployment" version = "4.2"/>
+		<Addin id = "Deployment.Linux" version = "4.2"/>
+		<Addin id = "SourceEditor2" version = "4.2" />
+		<Addin id = "DesignerSupport" version = "4.2" />
+		<Addin id = "Refactoring" version = "4.2" />
 	</Dependencies>
 	
 	<Extension path = "/MonoDevelop/Core/StockIcons">
@@ -241,7 +241,7 @@
 	    </Runtime>
 	    
 		<Dependencies>
-			<Addin id = "MonoDevelop.Autotools" version = "4.1.13"/>
+			<Addin id = "MonoDevelop.Autotools" version = "4.2"/>
 		</Dependencies>
 		
 		<Extension path = "/Autotools/SimpleSetups">

Modified: main/src/addins/CBinding/Compiler/GNUCompiler.cs
===================================================================
@@ -83,9 +83,9 @@ public abstract class GNUCompiler : CCompiler
 			string outputName = Path.Combine (configuration.OutputDirectory,
 			                                  configuration.CompiledOutputName);
 			
-			// Precompile header files and place them in .prec/<config_name>/
+			// Precompile header files and place them in prec/<config_name>/
 			if (configuration.PrecompileHeaders) {
-				string precDir = Path.Combine (configuration.SourceDirectory, ".prec");
+				string precDir = Path.Combine (configuration.IntermediateOutputDirectory, "prec");
 				string precConfigDir = Path.Combine (precDir, configuration.Id);
 				if (!Directory.Exists (precDir))
 					Directory.CreateDirectory (precDir);
@@ -188,7 +188,7 @@ public override string GetCompilerFlags (Project project, CProjectConfiguration
 					args.Append ("-I\"" + StringParserService.Parse (inc, GetStringTags (project)) + "\" ");
 			
 			if (configuration.PrecompileHeaders) {
-				string precdir = Path.Combine (configuration.SourceDirectory, ".prec");
+				string precdir = Path.Combine (configuration.IntermediateOutputDirectory, "prec");
 				precdir = Path.Combine (precdir, configuration.Id);
 				args.Append ("-I\"" + precdir + "\"");
 			}
@@ -279,7 +279,7 @@ private string[] DependedOnFiles (ProjectFile file, CProjectConfiguration config
 			
 			foreach (ProjectFile file in projectFiles) {
 				if (file.Subtype == Subtype.Code && CProject.IsHeaderFile (file.Name)) {
-					string precomp = Path.Combine (configuration.SourceDirectory, ".prec");
+					string precomp = Path.Combine (configuration.IntermediateOutputDirectory, "prec");
 					precomp = Path.Combine (precomp, configuration.Id);
 					precomp = Path.Combine (precomp, Path.GetFileName (file.Name) + ".ghc");
 					if (file.BuildAction == BuildAction.Compile) {
@@ -623,10 +623,10 @@ public override void Clean (ProjectFileCollection projectFiles, CProjectConfigur
 		
 		void CleanPrecompiledHeaders (CProjectConfiguration configuration)
 		{
-			if (string.IsNullOrEmpty (configuration.SourceDirectory))
+			if (string.IsNullOrEmpty (configuration.IntermediateOutputDirectory))
 			    return;
 			
-			string precDir = Path.Combine (configuration.SourceDirectory, ".prec");			
+			string precDir = Path.Combine (configuration.IntermediateOutputDirectory, "prec");			
 
 			if (Directory.Exists (precDir))
 				Directory.Delete (precDir, true);

Modified: main/src/addins/CSharpBinding/CSharpBinding.addin.xml
===================================================================
@@ -273,7 +273,7 @@
 	        <Import assembly="MonoDevelop.CSharpBinding.Autotools.dll"/>
 	    </Runtime>
 		<Dependencies>
-			<Addin id="Autotools" version="4.1.13"/>
+			<Addin id="Autotools" version="4.2"/>
 		</Dependencies>
 		<Extension path = "/MonoDevelop/Autotools/SimpleSetups">
 			<Class class="CSharpBinding.Autotools.CSharpAutotoolsSetup" />
@@ -285,7 +285,7 @@
 			<Import assembly="MonoDevelop.CSharpBinding.AspNet.dll"/>
 		</Runtime>
 		<Dependencies>
-			<Addin id="AspNet" version="4.1.13"/>
+			<Addin id="AspNet" version="4.2"/>
 		</Dependencies>
 		<Extension path = "/MonoDevelop/Asp/CompletionBuilders">
 			<Class class = "MonoDevelop.CSharp.Completion.AspLanguageBuilder" />

Modified: main/src/addins/Deployment/MonoDevelop.Deployment.Linux/MonoDevelop.Deployment.Linux.addin.xml
===================================================================
@@ -6,7 +6,7 @@
        url         = "http://www.monodevelop.com"
        description = "Provides basic deployment services for Linux"
        category    = "Deployment"
-       version     = "4.1.13"
+       version     = "4.2"
        flags       = "Hidden"
        compatVersion = "4.0">
 
@@ -15,9 +15,9 @@
 	</Runtime>
 
 	<Dependencies>
-		<Addin id="Core" version="4.1.13"/>
-		<Addin id="Ide" version="4.1.13"/>
-		<Addin id="Deployment" version="4.1.13"/>
+		<Addin id="Core" version="4.2"/>
+		<Addin id="Ide" version="4.2"/>
+		<Addin id="Deployment" version="4.2"/>
 	</Dependencies>
 
 	<Extension path = "/MonoDevelop/Ide/Commands">

Modified: main/src/addins/Deployment/MonoDevelop.Deployment/MonoDevelop.Deployment.addin.xml
===================================================================
@@ -6,14 +6,14 @@
        url         = "http://www.monodevelop.com"
        description = "Provides basic deployment services"
        category    = "Deployment"
-       version     = "4.1.13"
+       version     = "4.2"
        flags       = "Hidden"
        compatVersion = "4.0">
 
 	<Dependencies>
-		<Addin id="Core" version="4.1.13"/>
-		<Addin id="Ide" version="4.1.13"/>
-		<Addin id="DesignerSupport" version="4.1.13"/>
+		<Addin id="Core" version="4.2"/>
+		<Addin id="Ide" version="4.2"/>
+		<Addin id="DesignerSupport" version="4.2"/>
 	</Dependencies>
 
 	<Extension path = "/MonoDevelop/Ide/Commands">

Modified: main/src/addins/MacPlatform/MacInterop/Keychain.cs
===================================================================
@@ -528,11 +528,8 @@ static unsafe string GetUsernameFromKeychainItemRef (IntPtr itemRef)
 			                                              0, null, (uint) path.Length, path, (ushort) uri.Port,
 			                                              protocol, auth, out passwordLength, out passwordData, ref item);
 
-			if (result == OSStatus.ItemNotFound)
-				return null;
-
 			if (result != OSStatus.Ok)
-				throw new Exception ("Could not find internet username and password: " + GetError (result));
+				return null;
 
 			var username = GetUsernameFromKeychainItemRef (item);
 
@@ -564,11 +561,8 @@ public static string FindInternetPassword (Uri uri)
 
 			CFRelease (item);
 
-			if (result == OSStatus.ItemNotFound)
-				return null;
-
 			if (result != OSStatus.Ok)
-				throw new Exception ("Could not find internet password: " + GetError (result));
+				return null;
 
 			return Marshal.PtrToStringAuto (passwordData, (int) passwordLength);
 		}

Modified: main/src/addins/MonoDevelop.CodeMetrics/MonoDevelop.CodeMetrics.addin.xml
===================================================================
@@ -7,15 +7,15 @@
         url = "http://www.monodevelop.com/"
         description = "Provides code metric support for monodevelop"
         category = "IDE extensions"
-        version = "4.1.13">
+        version = "4.2">
 	
 	<Runtime>
 		<Import assembly = "MonoDevelop.CodeMetrics.dll"/>
 	</Runtime>
 
 	<Dependencies>
-		<Addin id="Core" version="4.1.13"/>
-		<Addin id="Ide" version="4.1.13"/>
+		<Addin id="Core" version="4.2"/>
+		<Addin id="Ide" version="4.2"/>
 	</Dependencies>
 
 	<Extension path = "/MonoDevelop/Ide/Commands">


Modified: main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.AspNet/Manifest.addin.xml
===================================================================
@@ -5,13 +5,13 @@
        description = "Mono Soft Debugger Support for ASP.NET"
        copyright   = "MIT X11"
        category    = "Debugging"
-       version     = "4.1.13">
+       version     = "4.2">
 
 	<Dependencies>
-		<Addin id="MonoDevelop.Core" version="4.1.13"/>
-		<Addin id="MonoDevelop.Debugger" version="4.1.13"/>
-		<Addin id="MonoDevelop.AspNet" version="4.1.13"/>
-		<Addin id="MonoDevelop.Debugger.Soft" version="4.1.13"/>
+		<Addin id="MonoDevelop.Core" version="4.2"/>
+		<Addin id="MonoDevelop.Debugger" version="4.2"/>
+		<Addin id="MonoDevelop.AspNet" version="4.2"/>
+		<Addin id="MonoDevelop.Debugger.Soft" version="4.2"/>
 	</Dependencies>
 	
 	<Extension path="/MonoDevelop/Debugging/DebuggerEngines">

Modified: main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft.Moonlight/Manifest.addin.xml
===================================================================
@@ -5,13 +5,13 @@
        description = "Mono Soft Debugger Support for Moonlight"
        copyright   = "MIT X11"
        category    = "Debugging"
-       version     = "4.1.13">
+       version     = "4.2">
 
 	<Dependencies>
-		<Addin id="MonoDevelop.Core" version="4.1.13"/>
-		<Addin id="MonoDevelop.Debugger" version="4.1.13"/>
-		<Addin id="MonoDevelop.Moonlight" version="4.1.13"/>
-		<Addin id="MonoDevelop.Debugger.Soft" version="4.1.13"/>
+		<Addin id="MonoDevelop.Core" version="4.2"/>
+		<Addin id="MonoDevelop.Debugger" version="4.2"/>
+		<Addin id="MonoDevelop.Moonlight" version="4.2"/>
+		<Addin id="MonoDevelop.Debugger.Soft" version="4.2"/>
 	</Dependencies>
 	
 	<Extension path="/MonoDevelop/Debugging/DebuggerEngines">

Modified: main/src/addins/MonoDevelop.Debugger.Soft/MonoDevelop.Debugger.Soft/Manifest.addin.xml
===================================================================
@@ -5,11 +5,11 @@
        description = "Mono Soft Debugger Support"
        copyright   = "MIT X11"
        category    = "Debugging"
-       version     = "4.1.13">
+       version     = "4.2">
 
 	<Dependencies>
-		<Addin id="MonoDevelop.Core" version="4.1.13"/>
-		<Addin id="MonoDevelop.Debugger" version="4.1.13"/>
+		<Addin id="MonoDevelop.Core" version="4.2"/>
+		<Addin id="MonoDevelop.Debugger" version="4.2"/>
 	</Dependencies>
 	
 	<Runtime>

Modified: main/src/addins/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32/MonoDevelop.Debugger.Win32.addin.xml
===================================================================
@@ -5,13 +5,13 @@
        description = "Managed Debugging Engine support for MS.NET"
        copyright   = "MIT X11"
        category = "Debugging"
-       version   = "4.1.13">
+       version   = "4.2">
 
 	<Dependencies>
-		<Addin id="MonoDevelop.Core" version="4.1.13"/>
-		<Addin id="MonoDevelop.Ide" version="4.1.13"/>
-		<Addin id="MonoDevelop.Debugger" version="4.1.13"/>
-		<Addin id="MonoDevelop.AspNet" version="4.1.13"/>
+		<Addin id="MonoDevelop.Core" version="4.2"/>
+		<Addin id="MonoDevelop.Ide" version="4.2"/>
+		<Addin id="MonoDevelop.Debugger" version="4.2"/>
+		<Addin id="MonoDevelop.AspNet" version="4.2"/>
 	</Dependencies>
 
 	<Extension path="/MonoDevelop/Debugging/DebuggerEngines">

Modified: main/src/addins/MonoDevelop.Debugger/MonoDevelop.Debugger.addin.xml
===================================================================
@@ -6,11 +6,11 @@
        description = "Support for Debugging projects"
        copyright = "MIT X11"
        flags = "Hidden"
-       version = "4.1.13">
+       version = "4.2">
 
 	<Dependencies>
-		<Addin id="Core" version="4.1.13"/>
-		<Addin id="Ide" version="4.1.13"/>
+		<Addin id="Core" version="4.2"/>
+		<Addin id="Ide" version="4.2"/>
 	</Dependencies>
 	
 	<ExtensionPoint path="/MonoDevelop/Debugging/DebuggerEngines">

Modified: main/src/addins/MonoDevelop.GtkCore/MonoDevelop.GtkCore.addin.xml
===================================================================
@@ -6,7 +6,7 @@
        url         = ""
        description = "Provides support for visual design of GTK# windows, dialogs and widgets."
        category    = "IDE extensions"
-       version     = "4.1.13">
+       version     = "4.2">
 
 	<Runtime>
 		<Import assembly="libstetic.dll"/>
@@ -17,9 +17,9 @@
 	</Runtime>
 
 	<Dependencies>
-		<Addin id="Core" version="4.1.13"/>
-		<Addin id="Ide" version="4.1.13"/>
-		<Addin id="DesignerSupport" version="4.1.13"/>
+		<Addin id="Core" version="4.2"/>
+		<Addin id="Ide" version="4.2"/>
+		<Addin id="DesignerSupport" version="4.2"/>
 	</Dependencies>
 	
 	<ExtensionPoint path = "/MonoDevelop/GtkCore/ContextMenu/ProjectPad.ActionGroup">

Modified: main/src/addins/MonoDevelop.GtkCore2/MonoDevelop.GtkCore2.addin.xml
===================================================================
@@ -6,7 +6,7 @@
        url         = ""
        description = "Experimental GTK# visual designer developed during GSOC 2010 as a fork of stetic"
        category    = "IDE extensions"
-       version     = "4.1.13">
+       version     = "4.2">
 
 	<Runtime>
 		<Import assembly="libstetic2.dll"/>
@@ -17,11 +17,11 @@
 	</Runtime>
 
 	<Dependencies>
-		<Addin id="Core" version="4.1.13"/>
-		<Addin id="Ide" version="4.1.13"/>
-		<Addin id="DesignerSupport" version="4.1.13"/>
-		<Addin id="XmlEditor" version="4.1.13"/>
-		<Addin id="Refactoring" version="4.1.13"/>
+		<Addin id="Core" version="4.2"/>
+		<Addin id="Ide" version="4.2"/>
+		<Addin id="DesignerSupport" version="4.2"/>
+		<Addin id="XmlEditor" version="4.2"/>
+		<Addin id="Refactoring" version="4.2"/>
 	</Dependencies>
 	
 	<ExtensionPoint path = "/MonoDevelop/GtkCore/ContextMenu/ProjectPad.ActionGroup">

Modified: main/src/addins/MonoDevelop.Moonlight/MonoDevelop.Moonlight.addin.xml
===================================================================
@@ -6,14 +6,14 @@
        url         = "http://www.monodevelop.com/"
        description = "Support for editing, compiling, and running Moonlight/Silverlight projects."
        category    = "Web Development"
-       version     = "4.1.13">
+       version     = "4.2">
 	
 	<Dependencies>
-		<Addin id="Core" version="4.1.13"/>
-		<Addin id="Ide" version="4.1.13"/>
-		<Addin id="DesignerSupport" version="4.1.13"/>
-		<Addin id="Deployment" version="4.1.13"/>
-		<Addin id="AspNet" version="4.1.13" />
+		<Addin id="Core" version="4.2"/>
+		<Addin id="Ide" version="4.2"/>
+		<Addin id="DesignerSupport" version="4.2"/>
+		<Addin id="Deployment" version="4.2"/>
+		<Addin id="AspNet" version="4.2" />
 	</Dependencies>
 
 	<Runtime>


Modified: main/src/addins/MonoDevelop.XmlEditor/MonoDevelop.XmlEditor.addin.xml
===================================================================
@@ -6,7 +6,7 @@
        url         = "http://md-xed.sourceforge.net"
        description = "XML Editor"
        category    = "IDE extensions"
-       version     = "4.1.13">
+       version     = "4.2">
 
 	<Runtime>
 		<Import assembly="MonoDevelop.XmlEditor.dll" />
@@ -21,10 +21,10 @@
 	</Runtime>
 
 	<Dependencies>
-		<Addin id="Core" version="4.1.13"/>
-		<Addin id="Ide" version="4.1.13"/>
-		<Addin id="DesignerSupport" version="4.1.13"/>
-		<Addin id="SourceEditor2" version="4.1.13"/>
+		<Addin id="Core" version="4.2"/>
+		<Addin id="Ide" version="4.2"/>
+		<Addin id="DesignerSupport" version="4.2"/>
+		<Addin id="SourceEditor2" version="4.2"/>
 	</Dependencies>
 
 	<ExtensionPoint path = "/MonoDevelop/XmlEditor/XmlFileAssociations">


Modified: main/src/addins/MonoDeveloperExtensions/MonoDeveloperExtensions.addin.xml
===================================================================
@@ -6,15 +6,15 @@
        url         = "http://www.monodevelop.com"
        description = "Provides some IDE extensions useful for developing and building the Mono class libraries."
        category    = "Project Import and Export"
-       version     = "4.1.13">
+       version     = "4.2">
     
     <Runtime>
         <Import assembly="MonoDeveloperExtensions.dll"/>
     </Runtime>
 
 	<Dependencies>
-		<Addin id="Core" version="4.1.13"/>
-		<Addin id="Ide" version="4.1.13"/>
+		<Addin id="Core" version="4.2"/>
+		<Addin id="Ide" version="4.2"/>
 	</Dependencies>
 
 	<Extension path = "/MonoDevelop/ProjectModel/FileFormats">
@@ -51,7 +51,7 @@
 	        <Import assembly="MonoDeveloperExtensions_nunit.dll"/>
 	    </Runtime>
 		<Dependencies>
-			<Addin id="NUnit" version="4.1.13"/>
+			<Addin id="NUnit" version="4.2"/>
 		</Dependencies>
 		<Extension path = "/MonoDevelop/NUnit/TestProviders">
 			<Class id = "MonoTestProvider" class = "MonoDeveloper.MonoTestProvider"/>

Modified: main/src/addins/NUnit/MonoDevelopNUnit.addin.xml
===================================================================
@@ -6,7 +6,7 @@
        url         = "http://monodevelop.com"
        description = "Integrates NUnit into the MonoDevelop IDE."
        category    = "Testing"
-       version     = "4.1.13">
+       version     = "4.2">
 
 	<Runtime>
 		<Import assembly="MonoDevelop.NUnit.dll" />
@@ -17,8 +17,8 @@
 	</Runtime>
 	
 	<Dependencies>
-		<Addin id="Core" version="4.1.13"/>
-		<Addin id="Ide" version="4.1.13"/>
+		<Addin id="Core" version="4.2"/>
+		<Addin id="Ide" version="4.2"/>
 	</Dependencies>
 	
 	<!-- Extension Points -->

Modified: main/src/addins/TextTemplating/MonoDevelop.TextTemplating/MonoDevelop.TextTemplating.addin.xml
===================================================================
@@ -6,16 +6,16 @@
        url         = "http://monodevelop.com"
        description = "Support for editing and running T4 text templates."
        category    = "IDE extensions"
-       version     = "4.1.13">
+       version     = "4.2">
 	
 	<Runtime>
 		<Import assembly="Mono.TextTemplating.dll" />
 	</Runtime>
 
 	<Dependencies>
-		<Addin id="Core" version="4.1.13"/>
-		<Addin id="Ide" version="4.1.13"/>
-		<Addin id="SourceEditor2" version="4.1.13"/>
+		<Addin id="Core" version="4.2"/>
+		<Addin id="Ide" version="4.2"/>
+		<Addin id="SourceEditor2" version="4.2"/>
 	</Dependencies>
 
 	<Extension path = "/MonoDevelop/SourceEditor2/SyntaxModes">

Modified: main/src/addins/VBNetBinding/VBNetBinding.addin.xml
===================================================================
@@ -6,11 +6,11 @@
        url         = "http://bard.sytes.net/vbnetbinding"
        description = "VB.NET Language Binding"
        category    = "Language bindings"
-       version     = "4.1.13">
+       version     = "4.2">
 
 	<Dependencies>
-		<Addin id="Core" version="4.1.13"/>
-		<Addin id="Ide" version="4.1.13"/>
+		<Addin id="Core" version="4.2"/>
+		<Addin id="Ide" version="4.2"/>
 	</Dependencies>
 	
 	<Extension path = "/MonoDevelop/ProjectModel/MSBuildItemTypes">

Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git.addin.xml
===================================================================
@@ -6,7 +6,7 @@
        url         = "http://www.monodevelop.com/"
        description = "Git support for the Version Control Add-in"
        category    = "Version Control"
-       version     = "4.1.13">
+       version     = "4.2">
  
 	<Runtime>
 		<Import assembly="MonoDevelop.VersionControl.Git.dll"/>
@@ -14,9 +14,9 @@
 	</Runtime>
 
 	<Dependencies>
-	    <Addin id="Core" version="4.1.13"/>
-	    <Addin id="Ide" version="4.1.13"/>
-	    <Addin id="VersionControl" version="4.1.13"/>
+	    <Addin id="Core" version="4.2"/>
+	    <Addin id="Ide" version="4.2"/>
+	    <Addin id="VersionControl" version="4.2"/>
 	</Dependencies>
 
 	<Extension path="/MonoDevelop/VersionControl/VersionControlSystems">

Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix.addin.xml
===================================================================
@@ -6,13 +6,13 @@
        url       = "http://taubz.for.net/code/diff"
        description = "Subversion support for Linux and MacOSX"
        category  = "Version Control"
-       version   = "4.1.13">
+       version   = "4.2">
 
 	<Dependencies>
-	    <Addin id="Core" version="4.1.13"/>
-	    <Addin id="Ide" version="4.1.13"/>
-	    <Addin id="VersionControl" version="4.1.13"/>
-	    <Addin id="VersionControl.Subversion" version="4.1.13"/>
+	    <Addin id="Core" version="4.2"/>
+	    <Addin id="Ide" version="4.2"/>
+	    <Addin id="VersionControl" version="4.2"/>
+	    <Addin id="VersionControl.Subversion" version="4.2"/>
 	</Dependencies>
 
 	<Extension path = "/MonoDevelop/VersionControl/VersionControlSystems">


Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.addin.xml
===================================================================
@@ -7,11 +7,11 @@
        description = "Subversion core engine"
        category  = "Version Control"
        flags     = "Hidden"
-       version   = "4.1.13">
+       version   = "4.2">
  
 	<Dependencies>
-	    <Addin id="Core" version="4.1.13"/>
-	    <Addin id="Ide" version="4.1.13"/>
-	    <Addin id="VersionControl" version="4.1.13"/>
+	    <Addin id="Core" version="4.2"/>
+	    <Addin id="Ide" version="4.2"/>
+	    <Addin id="VersionControl" version="4.2"/>
 	</Dependencies>
 </Addin>


Modified: main/src/addins/VersionControl/MonoDevelop.VersionControl/VersionControl.addin.xml
===================================================================
@@ -7,7 +7,7 @@
        description = "A MonoDevelop addin for using version control systems like Subversion"
        category    = "Version Control"
        flags = "Hidden"
-       version   = "4.1.13">
+       version   = "4.2">
  
 	<Runtime>
 		<Import file="comment.png" />
@@ -24,9 +24,9 @@
 	</Runtime>
 
 	<Dependencies>
-	    <Addin id="Core" version="4.1.13"/>
-	    <Addin id="Ide" version="4.1.13"/>
-	    <Addin id="SourceEditor2" version="4.1.13"/>
+	    <Addin id="Core" version="4.2"/>
+	    <Addin id="Ide" version="4.2"/>
+	    <Addin id="SourceEditor2" version="4.2"/>
 	</Dependencies>
 
 	<ExtensionPoint path = "/MonoDevelop/VersionControl/VersionControlSystems" name = "Version control systems">

Modified: main/src/addins/VersionControl/Subversion.Win32/Manifest.addin.xml
===================================================================
@@ -1,6 +1,6 @@
 <Addin id        = "SubversionAddinWindows"
        namespace = "MonoDevelop"
-       version   = "4.1.13">
+       version   = "4.2">
   <Header>
     <Name>Subversion Add-in</Name>
     <Description>Subversion support for the Version Control Add-in</Description>
@@ -12,10 +12,10 @@
   </Header>
 
 	<Dependencies>
-		<Addin id="Core" version="4.1.13"/>
-		<Addin id="Ide" version="4.1.13"/>
-		<Addin id="VersionControl" version="4.1.13"/>
-		<Addin id="VersionControl.Subversion" version="4.1.13"/>
+		<Addin id="Core" version="4.2"/>
+		<Addin id="Ide" version="4.2"/>
+		<Addin id="VersionControl" version="4.2"/>
+		<Addin id="VersionControl.Subversion" version="4.2"/>
 	</Dependencies>
 
   <!-- Some files are excluded twice. This is on purpose to work around some case sensivity issues. If you change this you break addin installation on windows -->


Modified: main/src/addins/WindowsPlatform/WindowsPlatform.addin.xml
===================================================================
@@ -6,15 +6,15 @@
        url         = "http://monodevelop.com/"
        description = "Windows Platform Support for MonoDevelop"
        category    = "Platform Support"
-       version     = "4.1.13">
+       version     = "4.2">
 
 	<Runtime>
 		<Import assembly="WindowsPlatform.dll"/>
 	</Runtime>
 
 	<Dependencies>
-		<Addin id="Core" version="4.1.13"/>
-		<Addin id="Ide" version="4.1.13"/>
+		<Addin id="Core" version="4.2"/>
+		<Addin id="Ide" version="4.2"/>
   </Dependencies>
 
 


Modified: main/src/core/MonoDevelop.Core/BuildVariables.cs
===================================================================
@@ -2,8 +2,8 @@ namespace MonoDevelop
 {
 	public static class BuildInfo
 	{
-		public const string Version = "4.1.13";
-		public const string VersionLabel = "4.1.13";
+		public const string Version = "4.2";
+		public const string VersionLabel = "4.2";
 		public const string CompatVersion = "4.0";
 	}
 }

Modified: main/tests/TestRunner/MonoDevelop.TestRunner.addin.xml
===================================================================
@@ -6,11 +6,11 @@
        description = "Test runner for the MonoDevelop unit tests"
        category    = "MonoDevelop Core"
        isroot      = "false"
-       version     = "4.1.13"
+       version     = "4.2"
        compatVersion = "4.0">
 
 	<Dependencies>
-		<Addin id="Core" version="4.1.13"/>
+		<Addin id="Core" version="4.2"/>
 	</Dependencies>
 	
 	<Extension path = "/MonoDevelop/Core/Applications">

Modified: version-checks
===================================================================
@@ -17,7 +17,7 @@ DEP[0]=md-addins
 DEP_NAME[0]=MDADDINS
 DEP_PATH[0]=${top_srcdir}/../md-addins
 DEP_MODULE[0][email protected]:xamarin/md-addins.git
-DEP_NEEDED_VERSION[0]=3d230f0a822fb49b50a280d108878bd91335b338
+DEP_NEEDED_VERSION[0]=9afde49791dc3aee4f732aecbbebf4fa3fea8616
 DEP_BRANCH_AND_REMOTE[0]="master origin/master"
 
 # heap-shot


_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches