Merge branch 'master' into newresolver

Conflicts:
	main/contrib/ICSharpCode.Decompiler/ICSharpCode.Decompiler.csproj
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/AstNode.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/CSharpModifierToken.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/Expressions/IdentifierExpression.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/Expressions/MemberReferenceExpression.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/Expressions/PointerReferenceExpression.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/Expressions/QueryExpression.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/GeneralScope/Constraint.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/GeneralScope/DelegateDeclaration.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/GeneralScope/ExternAliasDeclaration.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/GeneralScope/NamespaceDeclaration.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/GeneralScope/TypeDeclaration.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/GeneralScope/TypeParameterDeclaration.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/GeneralScope/UsingAliasDeclaration.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/Identifier.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/MemberType.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/SimpleType.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/Statements/ForeachStatement.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/Statements/GotoStatement.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/Statements/LabelStatement.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/Statements/TryCatchStatement.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/TypeMembers/EnumMemberDeclaration.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/TypeMembers/FixedVariableInitializer.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/TypeMembers/MemberDeclaration.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/TypeMembers/ParameterDeclaration.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Ast/TypeMembers/VariableInitializer.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Formatter/AstFormattingVisitor.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Parser/CSharpParser.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Parser/TypeSystemConvertVisitor.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Parser/mcs/anonymous.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Parser/mcs/async.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Parser/mcs/cs-parser.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Parser/mcs/cs-tokenizer.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Parser/mcs/ecore.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Parser/mcs/expression.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Parser/mcs/flowanalysis.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Parser/mcs/method.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Parser/mcs/report.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Refactoring/ContextAction/GenerateSwitchLabels.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Refactoring/ContextAction/InsertAnonymousMethodSignature.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Refactoring/ContextAction/RemoveBackingStore.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Refactoring/RefactoringContext.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Resolver/CSharpAttribute.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Resolver/CSharpResolver.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Resolver/ConstantValues.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Resolver/OverloadResolution.cs
	main/contrib/ICSharpCode.NRefactory.CSharp/Resolver/TypeInference.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Analysis/MinimalResolveContext.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Ast/Expressions/NamedArgumentExpression.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Ast/Expressions/TypeReferenceExpression.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Formatter/ITextEditorAdapter.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/OutputVisitor/IOutputFormatter.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/OutputVisitor/TextWriterOutputFormatter.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Parser/ParsedFile.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Parser/mcs/cs-parser.jay
	main/contrib/ICSharpCode.NRefactory/CSharp/Refactoring/TypeSystemAstBuilder.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/AliasNamespaceReference.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/AmbiguousResolveResult.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/ByReferenceResolveResult.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/ConstantResolveResult.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/Conversions.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/ErrorResolveResult.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/IResolveVisitorNavigator.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/ITypeOrNamespaceReference.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/LocalResolveResult.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/MapTypeIntoNewContext.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/MemberLookup.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/MemberResolveResult.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/MemberTypeOrNamespaceReference.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/MethodGroupResolveResult.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/NamespaceResolveResult.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/NodeListResolveVisitorNavigator.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/ResolveResult.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/ResolveVisitor.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/SimpleTypeOrNamespaceReference.cs
	main/contrib/ICSharpCode.NRefactory/CSharp/Resolver/TypeResolveResult.cs
	main/contrib/ICSharpCode.NRefactory/Documentation/IDStringProvider.cs
	main/contrib/ICSharpCode.NRefactory/Documentation/XmlDocumentationProvider.cs
	main/contrib/ICSharpCode.NRefactory/ICSharpCode.NRefactory.csproj
	main/contrib/ICSharpCode.NRefactory/Makefile.am
	main/contrib/ICSharpCode.NRefactory/PatternMatching/IPatternAstVisitor.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/ArrayType.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/ByReferenceType.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/CecilLoader.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/DomRegion.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/Error.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/ExtensionMethods.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/IAnnotatable.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/IParsedFile.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/IProjectContent.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/ITypeResolveContext.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/Implementation/AbstractType.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/Implementation/CompositeTypeResolveContext.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/Implementation/CompoundTypeDefinition.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/Implementation/DefaultTypeDefinition.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/Implementation/DefaultTypeParameter.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/Implementation/GetClassTypeReference.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/Implementation/ProxyTypeResolveContext.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/Implementation/SimpleProjectContent.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/Implementation/SpecializedMember.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/Implementation/TypeStorage.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/ParameterizedType.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/PointerType.cs
	main/contrib/ICSharpCode.NRefactory/TypeSystem/SharedTypes.cs
	main/contrib/ICSharpCode.NRefactory/Utils/DotNet35Compat.cs
	main/contrib/ICSharpCode.NRefactory/Utils/EmptyList.cs
	main/contrib/ICSharpCode.NRefactory/Utils/Platform.cs
	main/src/addins/CSharpBinding/CSharpBinding.csproj
	main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/CSharpTextEditorCompletion.cs
	main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/MemberCompletionData.cs
	main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/MethodParameterDataProvider.cs
	main/src/addins/CSharpBinding/MonoDevelop.CSharp.Completion/NewOverrideCompletionData.cs
	main/src/addins/CSharpBinding/MonoDevelop.CSharp.ContextAction/MDRefactoringContext.cs
	main/src/addins/CSharpBinding/MonoDevelop.CSharp.Formatting/CSharpFormatter.cs
	main/src/addins/CSharpBinding/MonoDevelop.CSharp.Highlighting/CSharpSyntaxMode.cs
	main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CSharpCodeGenerator.cs
	main/src/addins/CSharpBinding/MonoDevelop.CSharp.Refactoring/CreateMethod/CreateMethodCodeGenerator.cs
	main/src/addins/CSharpBinding/MonoDevelop.CSharp.Resolver/NRefactoryResolver.cs
	main/src/addins/CSharpBinding/MonoDevelop.CSharp/CSharpAmbience.cs
	main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/AssemblyBrowserWidget.cs
	main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/ColoredCSharpFormatter.cs
	main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/DomEventNodeBuilder.cs
	main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/DomFieldNodeBuilder.cs
	main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/DomMethodNodeBuilder.cs
	main/src/addins/MonoDevelop.AssemblyBrowser/MonoDevelop.AssemblyBrowser/DomPropertyNodeBuilder.cs
	main/src/addins/MonoDevelop.CodeMetrics/MonoDevelop.CodeMetrics.csproj
	main/src/addins/MonoDevelop.MacDev/ObjCIntegration/NSObjectInfoService.cs
	main/src/addins/MonoDevelop.MacDev/ObjCIntegration/NSObjectProjectInfo.cs
	main/src/addins/MonoDevelop.MacDev/ObjCIntegration/NSObjectTypeInfo.cs
	main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/FindDerivedClassesHandler.cs
	main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/FindReferencesHandler.cs
	main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/GotoDeclarationHandler.cs
	main/src/addins/MonoDevelop.Refactoring/MonoDevelop.Refactoring/RefactoryCommands.cs
	main/src/addins/MonoDevelop.SourceEditor2/MonoDevelop.SourceEditor/SourceEditorWidget.cs
	main/src/core/Mono.Texteditor/Mono.TextEditor/CodeSegmentPreviewWindow.cs
	main/src/core/Mono.Texteditor/Mono.TextEditor/Document.cs
	main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Dom.Parser/ProjectDom.cs
	main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Dom.Serialization/CodeCompletionDatabase.cs
	main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Dom.Serialization/DatabaseProjectDom.cs
	main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Dom.Serialization/ProjectCodeCompletionDatabase.cs
	main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Dom/DomCecilType.cs
	main/src/core/MonoDevelop.Core/MonoDevelop.Projects.Dom/DomType.cs
	main/src/core/MonoDevelop.Core/MonoDevelop.Projects/HelpService.cs
	main/src/core/MonoDevelop.Ide/ExtensionModel/MonoDevelop.Ide.addin.xml
	main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/AboutMonoDevelopTabPage.cs
	main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/CommonAboutDialog.cs
	main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Gui.Dialogs/VersionInformationTabPage.cs
	main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.csproj
	main/src/core/MonoDevelop.Ide/MonoDevelop.Ide/Ide.cs
	main/src/core/MonoDevelop.Ide/MonoDevelop.TypeSystem/AmbienceService.cs
	main/src/core/MonoDevelop.Ide/MonoDevelop.TypeSystem/CodeGenerator.cs
	main/src/core/MonoDevelop.Ide/MonoDevelop.TypeSystem/OutputFlags.cs
	main/src/core/MonoDevelop.Ide/MonoDevelop.TypeSystem/OutputSettings.cs
	main/src/core/MonoDevelop.Ide/MonoDevelop.TypeSystem/ParsedDocument.cs
	main/tests/UnitTests/MonoDevelop.CSharpBinding/TopLevelTests.cs

7 files changed, 29 insertions, 31 deletions

diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git.addin.xml b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git.addin.xml
index c7b0fe1ccc..9cf5f4ad34 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git.addin.xml
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Git/MonoDevelop.VersionControl.Git.addin.xml
@@ -6,16 +6,16 @@
        url         = "http://www.monodevelop.com/"
        description = "Git support for the Version Control Add-in"
        category    = "Version Control"
-       version     = "2.7">
+       version     = "2.8">
  
 	<Runtime>
 		<Import assembly="MonoDevelop.VersionControl.Git.dll"/>
 	</Runtime>
 
 	<Dependencies>
-	    <Addin id="Core" version="2.7"/>
-	    <Addin id="Ide" version="2.7"/>
-	    <Addin id="VersionControl" version="2.7"/>
+	    <Addin id="Core" version="2.8"/>
+	    <Addin id="Ide" version="2.8"/>
+	    <Addin id="VersionControl" version="2.8"/>
 	</Dependencies>
 	
 	<Extension path="/MonoDevelop/VersionControl/VersionControlSystems">
@@ -101,7 +101,8 @@
 		<StockIcon stockid = "vc-git-branch" resource = "arrow_branch.png"/>
 	</Extension>
 	
-	<Extension path = "/MonoDevelop/Ide/ProjectFeatures">
+<!--	<Extension path = "/MonoDevelop/Ide/ProjectFeatures">
 		<Class class = "MonoDevelop.VersionControl.Git.GitSupportFeature" />
 	</Extension>
+-->
 </Addin>
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix.addin.xml b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix.addin.xml
index 8dfa56d052..2dcbea4b75 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion.Unix/MonoDevelop.VersionControl.Subversion.Unix.addin.xml
+++ b/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   = "2.7">

+       version   = "2.8">

  

 	<Dependencies>

-	    <Addin id="Core" version="2.7"/>

-	    <Addin id="Ide" version="2.7"/>

-	    <Addin id="VersionControl" version="2.7"/>

-	    <Addin id="VersionControl.Subversion" version="2.7"/>

+	    <Addin id="Core" version="2.8"/>

+	    <Addin id="Ide" version="2.8"/>

+	    <Addin id="VersionControl" version="2.8"/>

+	    <Addin id="VersionControl.Subversion" version="2.8"/>

 	</Dependencies>
 	
 	<Extension path = "/MonoDevelop/VersionControl/VersionControlSystems">

diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.addin.xml b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.addin.xml
index f7f9a4547f..df50f85962 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.addin.xml
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl.Subversion/MonoDevelop.VersionControl.Subversion.addin.xml
@@ -7,12 +7,12 @@
        description = "Subversion core engine"

        category  = "Version Control"

        flags     = "Hidden"

-       version   = "2.7">

+       version   = "2.8">

  

 	<Dependencies>

-	    <Addin id="Core" version="2.7"/>

-	    <Addin id="Ide" version="2.7"/>

-	    <Addin id="VersionControl" version="2.7"/>

+	    <Addin id="Core" version="2.8"/>

+	    <Addin id="Ide" version="2.8"/>

+	    <Addin id="VersionControl" version="2.8"/>

 	</Dependencies>
 	
 	<Extension path = "/MonoDevelop/Ide/Commands/VersionControl">
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BlameWidget.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BlameWidget.cs
index a7d35136b4..26c19c63b1 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BlameWidget.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BlameWidget.cs
@@ -171,7 +171,7 @@ namespace MonoDevelop.VersionControl.Views
 			x += this.menuPopupLocation.X;
 			y += this.menuPopupLocation.Y;
 			Requisition request = menu.SizeRequest ();
-			Gdk.Rectangle geometry = Screen.GetMonitorGeometry (Screen.GetMonitorAtPoint (x, y));
+			Gdk.Rectangle geometry = DesktopService.GetUsableMonitorGeometry (Screen, Screen.GetMonitorAtPoint (x, y));
 			
 			y = Math.Max (geometry.Top, Math.Min (y, geometry.Bottom - request.Height));
 			x = Math.Max (geometry.Left, Math.Min (x, geometry.Right - request.Width));
@@ -294,7 +294,7 @@ namespace MonoDevelop.VersionControl.Views
 			int line = startLine;
 			var color = Style.Dark (State);
 			
-			while (curY < editor.Allocation.Bottom) {
+			while (curY < editor.Allocation.Bottom && line <= editor.LineCount) {
 				Annotation ann = line <= overview.annotations.Count ? overview.annotations[line - 1] : null;
 				double curStart = curY;
 				do {
@@ -723,7 +723,7 @@ namespace MonoDevelop.VersionControl.Views
 					}
 					double curY = startY - widget.Editor.VAdjustment.Value;
 					int line = startLine;
-					while (curY < Allocation.Bottom) {
+					while (curY < Allocation.Bottom && line <= widget.Editor.LineCount) {
 						double curStart = curY;
 //						widget.JumpOverFoldings (ref line);
 						int lineStart = line;
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DropDownBox.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DropDownBox.cs
index 25a6cb7a2e..82f4d4f98c 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DropDownBox.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/DropDownBox.cs
@@ -26,6 +26,7 @@
 
 using System;
 using System.ComponentModel;
+using MonoDevelop.Ide;
 using Gtk;
 
 namespace MonoDevelop.VersionControl.Views
@@ -106,7 +107,7 @@ namespace MonoDevelop.VersionControl.Views
 			window.WidthRequest = Allocation.Width;
 			int width, height;
 			window.GetSizeRequest (out width, out height);
-			Gdk.Rectangle geometry = Screen.GetMonitorGeometry (Screen.GetMonitorAtPoint (dx, dy));
+			Gdk.Rectangle geometry = DesktopService.GetUsableMonitorGeometry (Screen, Screen.GetMonitorAtPoint (dx, dy));
 			
 			if (dy + height > geometry.Bottom)
 				dy = oy + this.Allocation.Y - height;
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/EditorCompareWidgetBase.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/EditorCompareWidgetBase.cs
index 35b5893a54..0bdb75428f 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/EditorCompareWidgetBase.cs
+++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/EditorCompareWidgetBase.cs
@@ -240,7 +240,7 @@ namespace MonoDevelop.VersionControl.Views
 			x += this.menuPopupLocation.X;
 			y += this.menuPopupLocation.Y;
 			Requisition request = menu.SizeRequest ();
-			Gdk.Rectangle geometry = Screen.GetMonitorGeometry (Screen.GetMonitorAtPoint (x, y));
+			Gdk.Rectangle geometry = DesktopService.GetUsableMonitorGeometry (Screen, Screen.GetMonitorAtPoint (x, y));
 			
 			y = Math.Max (geometry.Top, Math.Min (y, geometry.Bottom - request.Height));
 			x = Math.Max (geometry.Left, Math.Min (x, geometry.Right - request.Width));
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/VersionControl.addin.xml b/main/src/addins/VersionControl/MonoDevelop.VersionControl/VersionControl.addin.xml
index 32a5b8c217..bfbd2347d9 100644
--- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/VersionControl.addin.xml
+++ b/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   = "2.7">
+       version   = "2.8">
  
 	<Runtime>
 		<Import file="comment.png" />
@@ -24,9 +24,9 @@
 	</Runtime>
 
 	<Dependencies>
-	    <Addin id="Core" version="2.7"/>
-	    <Addin id="Ide" version="2.7"/>
-	    <Addin id="SourceEditor2" version="2.7"/>
+	    <Addin id="Core" version="2.8"/>
+	    <Addin id="Ide" version="2.8"/>
+	    <Addin id="SourceEditor2" version="2.8"/>
 	</Dependencies>
 	
 	<ExtensionPoint path = "/MonoDevelop/VersionControl/VersionControlSystems" name = "Version control systems">
@@ -171,11 +171,6 @@
 		</Category>
 	</Extension>
 	
-	<Extension path="/MonoDevelop/Ide/MainMenu/File">
-		<SeparatorItem id = "CheckoutSep" insertafter="MonoDevelop.Ide.Commands.FileCommands.OpenFile" />
-		<CommandItem id="MonoDevelop.VersionControl.Commands.Checkout" />
-	</Extension>
-	
 	<Extension path = "/MonoDevelop/Ide/ContextMenu/DocumentTab">
 		<ItemSet id = "VersionControl" _label = "_Version Control" insertafter = "SaveSeparator">
 			<CommandItem id = "MonoDevelop.VersionControl.Commands.Diff"/>
@@ -186,6 +181,7 @@
 
 	<Extension path = "/MonoDevelop/Ide/MainMenu">
 		<ItemSet id = "VersionControl" _label = "_Version Control" insertafter = "Run" >
+			<CommandItem id = "MonoDevelop.VersionControl.Commands.Checkout" />
 			<CommandItem id = "MonoDevelop.VersionControl.Commands.Publish"/>
 			<SeparatorItem/>
 			<CommandItem id = "MonoDevelop.VersionControl.Commands.UpdateSolution"/>
@@ -311,8 +307,8 @@
 		<!-- 2.4 -->
 		<Migration sourceVersion="2.4" kind="Cache" path="version-control-commit-msg" />
 		<Migration sourceVersion="2.4" kind="Config" path="VersionControl.config" />
-		<!-- 2.6 -->
-		<Migration sourceVersion="2.6" kind="Cache" path="version-control-commit-msg" />
-		<Migration sourceVersion="2.6" kind="Config" path="VersionControl.config" />
+		<!-- 2.6+ -->
+		<Migration sourceVersion="2.6+" kind="Cache" path="version-control-commit-msg" />
+		<Migration sourceVersion="2.6+" kind="Config" path="VersionControl.config" />
 	</Extension>
 </Addin>